导出

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java

@@ -77,5 +77,7 @@ public class IcPartyActPageResultDTO implements Serializable {
     private String joinUserTypeName;
 
     private List<JoinOrgDTO> joinOrgList;
+    //导出用
+    private String joinOrgNameStr;
 }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java

@@ -263,11 +263,11 @@ public class IcPartyActController {
             List<IcPartyActExpoprtExcel> list = null;
             do {
                 data = icPartyActService.pageList(formDTO);
-                list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class);
-                list.forEach(l->{
+                data.getList().forEach(l->{
                     List<String> orgNameList = l.getJoinOrgList().stream().map(m -> m.getJoinOrgName()).distinct().collect(Collectors.toList());
                     l.setJoinOrgNameStr(orgNameList.stream().map(String::valueOf).collect(Collectors.joining(",")));
                 });
+                list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class);
                 formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
                 excelWriter.write(list, writeSheet);
             } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java

@@ -3,11 +3,9 @@ package com.epmet.modules.partyOrg.excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description
@@ -19,7 +17,7 @@ public class IcPartyActExpoprtExcel {
     /**
      * 活动主题
      */
-    @ExcelProperty(value = "活动主题")
+    @ExcelProperty(value = "活动主题11")
     @ColumnWidth(20)
     private String topic;
 
@@ -67,13 +65,11 @@ public class IcPartyActExpoprtExcel {
     private String isPublishName;
 
     @ExcelProperty(value = "参加人员")
-    @ColumnWidth(8)
+    @ColumnWidth(12)
     private String joinUserTypeName;
 
     @ExcelProperty(value = "参加活动党组织")
-    @ColumnWidth(40)
+    @ColumnWidth(80)
     private String joinOrgNameStr;
-
-    private List<JoinOrgDTO> joinOrgList;
 }