Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/controller/CwProjectRecordsController.java

@@ -1,12 +1,19 @@
 package com.jeeplus.test.cw.projectRecords.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.cw.projectRecords.service.CwProjectRecordsService;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
+import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
@@ -14,7 +21,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 财务项目登记controller
@@ -107,4 +119,39 @@ public class CwProjectRecordsController {
         return ResponseEntity.ok(s);
     }
 
+    /**
+     * 导出项目数据
+     *
+     * @param cwProjectRecordsDTO
+     * @param page
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog(value = "导出项目数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("export")
+    @ApiOperation(value = "导出项目数据")
+    public void exportFile(CwProjectRecordsDTO cwProjectRecordsDTO, Page <CwProjectRecordsDTO> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<CwProjectRecordsDTO> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = cwProjectRecordsService.findList (page,cwProjectRecordsDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = cwProjectRecordsService.findList (page,cwProjectRecordsDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = cwProjectRecordsService.findList (page,cwProjectRecordsDTO).getRecords();
+        }
+        result.stream().forEach(item -> {
+            if (StringUtils.isNotBlank(item.getStatus())){
+                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+            }
+        });
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectRecordsDTO.class, fileName, response );
+
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -33,6 +33,8 @@
         <result property="contractNum" column="contract_num" jdbcType="VARCHAR"/>
         <result property="payerSubject" column="payer_subject" jdbcType="VARCHAR"/>
         <result property="paymentMethod" column="payment_method" jdbcType="VARCHAR"/>
+        <result property="createName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="createDateT" column="create_date" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
     </resultMap>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.projectRecords.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
@@ -34,11 +35,13 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目编号
      */
+    @Excel(name = "项目编号",width = 25,orderNum = "1")
     private String projectNumber;
 
     /**
      * 项目名称
      */
+    @Excel(name = "项目名称",width = 25,orderNum = "0")
     private String projectName;
 
     /**
@@ -93,6 +96,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 状态
      */
+    @Excel(name = "审核状态",width = 25,orderNum = "5")
     private String status;
 
 
@@ -109,6 +113,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目经理姓名
      */
+    @Excel(name = "项目经理",width = 25,orderNum = "2")
     private String projectMasterName;
 
     /**
@@ -150,4 +155,17 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 创建人id
      */
     private String createId;
+
+    /**
+     * 创建人姓名
+     */
+    @Excel(name = "创建人",width = 25,orderNum = "3")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "4")
+    private String createDateT;
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -4,7 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.CwProjectReportArchiveService;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
@@ -15,7 +21,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 财务项目报告归档
@@ -113,4 +123,39 @@ public class CwProjectReportArchiveController {
         return ResponseEntity.ok(s);
     }
 
+    /**
+     * 导出报告归档数据
+     *
+     * @param cwProjectReportArchiveDTO
+     * @param page
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog(value = "导出报告归档数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("export")
+    @ApiOperation(value = "导出报告归档数据")
+    public void exportFile(CwProjectReportArchiveDTO cwProjectReportArchiveDTO, Page <CwProjectReportArchiveDTO> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<CwProjectReportArchiveDTO> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = cwProjectReportArchiveService.findList (page, cwProjectReportArchiveDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = cwProjectReportArchiveService.findList (page, cwProjectReportArchiveDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = cwProjectReportArchiveService.findList (page, cwProjectReportArchiveDTO).getRecords();
+        }
+        result.stream().forEach(item -> {
+            if (StringUtils.isNotBlank(item.getStatus())){
+                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+            }
+        });
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectReportArchiveDTO.class, fileName, response );
+
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -27,6 +27,10 @@
             <result property="auditedUnitsName" column="audited_units_name" jdbcType="VARCHAR"/>
             <result property="createBy.name" column="user_name" jdbcType="VARCHAR"/>
             <result property="fileNumber" column="file_number" jdbcType="VARCHAR"/>
+            <result property="projectMasterName" column="project_master_name" jdbcType="VARCHAR"/>
+            <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
+            <result property="createName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="createDateT" column="create_date" jdbcType="VARCHAR"/>
         <association property="cwProjectRecordsDTO" column="project_id" select="getProject" javaType="com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO"></association>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
         <collection property="cwProjectReportArchiveReportDTOList" ofType="com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveReportDTO" column="id" select="getReportList"></collection>
@@ -211,10 +215,14 @@
         select
         <include refid="Base_Column_List"></include>,
         cw_wcb.name as audited_units_name,
-        su.name as user_name
+        su.name as user_name,
+        su1.name as project_master_name,
+        cw_pr.project_name as project_name
         from cw_project_report_archive cw_pa
         left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
         left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
+        left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
+        left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.projectReportArchive.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
 import lombok.Data;
@@ -28,6 +29,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 档案名称
      */
+    @Excel(name = "档案名称",width = 25,orderNum = "0")
     private String name;
 
     /**
@@ -38,21 +40,25 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 报告册数
      */
+    @Excel(name = "报告册数",width = 25,orderNum = "5")
     private String reportNum;
 
     /**
      * 底稿册数
      */
+    @Excel(name = "底稿册数",width = 25,orderNum = "6")
     private String papersNum;
 
     /**
      * 档案年度
      */
+    @Excel(name = "档案年度",width = 25,orderNum = "7")
     private String year;
 
     /**
      * 案卷号
      */
+    @Excel(name = "案卷号",width = 25,orderNum = "8")
     private String number;
 
     /**
@@ -63,6 +69,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 归档时间
      */
+    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "9")
     private Date auditDate;
 
     /**
@@ -98,6 +105,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 被审计单位名称
      */
+    @Excel(name = "被审计单位",width = 25,orderNum = "4")
     private String auditedUnitsName;
 
     /**
@@ -118,7 +126,32 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 档案号
      */
+    @Excel(name = "档案号",width = 25,orderNum = "1")
     private String fileNumber;
 
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称",width = 25,orderNum = "2")
+    private String projectName;
+
+    /**
+     * 项目经理
+     */
+    @Excel(name = "项目经理",width = 25,orderNum = "3")
+    private String projectMasterName;
+
+    /**
+     * 创建人姓名
+     */
+    @Excel(name = "创建人",width = 25,orderNum = "10")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "11")
+    private String createDateT;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/controller/CwWorkClientController.java

@@ -1,12 +1,24 @@
 package com.jeeplus.test.cw.workClientInfo.controller;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.util.ObjectUtil;
+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.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
+import com.jeeplus.core.excel.utils.EasyPoiUtil;
+import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.cw.workClientInfo.service.CwWorkClientService;
 import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
+import com.jeeplus.test.jobPosion.domain.JobPosition;
+import com.jeeplus.test.jobPosion.service.dto.JobPositionDTO;
+import com.jeeplus.test.jobPosion.service.mapstruct.JobPositionWrapper;
 import com.jeeplus.test.klgBase.question.service.dto.KlgBaseQuestionsDTO;
 import com.jeeplus.test.knowledge.domain.KnowledgeShareComment;
 import com.jeeplus.test.knowledge.domain.KnowledgeShareDetail;
@@ -15,12 +27,21 @@ import com.jeeplus.test.knowledge.service.dto.KnowledgeShareInfoDto;
 import com.jeeplus.test.knowledge.service.dto.KnowledgeShareListDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.http.client.utils.DateUtils;
+import org.flowable.engine.impl.el.DateUtil;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Api("客户信息")
@@ -110,4 +131,58 @@ public class CwWorkClientController {
     }
 
 
+    /**
+     * 导出客户数据
+     *
+     * @param cwWorkClientBaseDTO
+     * @param page
+     * @param response
+     * @throws Exception
+     */
+    @ApiLog(value = "导出客户数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("export")
+    @ApiOperation(value = "导出客户数据")
+    public void exportFile(CwWorkClientBaseDTO cwWorkClientBaseDTO, Page <CwWorkClientBaseDTO> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<CwWorkClientBaseDTO> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = cwWorkClientService.findList (page,cwWorkClientBaseDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = cwWorkClientService.findList (page,cwWorkClientBaseDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = cwWorkClientService.findList (page,cwWorkClientBaseDTO).getRecords();
+        }
+        result.stream().forEach(item -> {
+            if (StringUtils.isNotBlank(item.getType())){
+                item.setType(DictUtils.getDictLabel(item.getType(),"cw_work_client_type",""));
+            }
+            if (StringUtils.isNotBlank(item.getIndustry())){
+                item.setIndustry(DictUtils.getDictLabel(item.getIndustry(),"cw_work_client_industry",""));
+            }
+            if (StringUtils.isNotBlank(item.getIsListed())) {
+                item.setIsListed(DictUtils.getDictLabel(item.getIsListed(),"yes_no",""));
+            }
+            if (StringUtils.isNotBlank(item.getAffiliation())){
+                item.setAffiliation(DictUtils.getDictLabel(item.getAffiliation(),"cw_work_client_affiliation",""));
+            }
+            if (StringUtils.isNotBlank(item.getOwnershipType())){
+                item.setOwnershipType(DictUtils.getDictLabel(item.getOwnershipType(),"cw_work_client_ownership_type",""));
+            }
+            if (StringUtils.isNotBlank(item.getReportType())){
+                item.setReportType(DictUtils.getDictLabel(item.getReportType(),"cw_work_client_report_type",""));
+            }
+            if (StringUtils.isNotBlank(item.getStatus())){
+                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+            }
+        });
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwWorkClientBaseDTO.class, fileName, response );
+
+    }
+
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -38,6 +38,11 @@
             <result property="agreeDate" column="agree_date" jdbcType="TIMESTAMP"/>
             <result property="agreeUserId" column="agree_user_id" jdbcType="VARCHAR"/>
             <result property="createBy.name" column="user_name" jdbcType="VARCHAR"/>
+            <result property="createName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="createDateT" column="create_date" jdbcType="TIMESTAMP"/>
+            <result property="isListed" column="is_listed" jdbcType="VARCHAR"/>
+            <result property="ownershipType" column="ownership_type" jdbcType="VARCHAR"/>
+            <result property="finalStatusType" column="final_status_type" jdbcType="VARCHAR"/>
             <association property="cwWorkClientTypeDTO" column="id" select="getType" javaType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientTypeDTO"></association>
             <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
             <collection property="cwWorkClientBillingDTOList" ofType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBillingDTO" column="id" select="getBilling"></collection>
@@ -208,7 +213,10 @@
     <select id="findList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>,
-        su.name as user_name
+        su.name as user_name,
+        cw_wct.is_listed as is_listed,
+        cw_wct.ownership_type as ownership_type,
+        cw_wct.final_status_type as final_status_type
         from cw_work_client_base cw_wcb
         left join sys_user su on su.id = cw_wcb.create_by
         left join cw_work_client_type cw_wct on cw_wct.client_id = cw_wcb.id and cw_wct.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwWorkClientBaseDTO.java

@@ -1,11 +1,15 @@
 package com.jeeplus.test.cw.workClientInfo.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -15,6 +19,7 @@ import java.util.List;
  * @TableName cw_work_client_base
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class CwWorkClientBaseDTO extends BaseDTO {
 
     public static final String BIZ_CODE = "11";
@@ -27,11 +32,13 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 客户编号
      */
+    @Excel(name = "客户编号",width = 25,orderNum = "1")
     private String no;
 
     /**
      * 客户名称
      */
+    @Excel(name = "客户名称",width = 30,orderNum = "0")
     private String name;
 
     /**
@@ -42,16 +49,19 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 英文名称
      */
+    @Excel(name = "英文名称",width = 25,orderNum = "4")
     private String englishName;
 
     /**
      * 客户类型
      */
+    @Excel(name = "客户类型",width = 25,orderNum = "2")
     private String type;
 
     /**
      * 统一社会信用代码
      */
+    @Excel(name = "统一社会信用代码",width = 25,orderNum = "3")
     private String uscCode;
 
     /**
@@ -92,11 +102,13 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 所属行业
      */
+    @Excel(name = "所属行业",width = 25,orderNum = "5")
     private String industry;
 
     /**
      * 企业隶属关系划分
      */
+    @Excel(name = "企业隶属关系划分",width = 25,orderNum = "7")
     private String affiliation;
 
     /**
@@ -107,6 +119,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 客户报备类型
      */
+    @Excel(name = "客户报备类型",width = 25,orderNum = "10")
     private String reportType;
 
     /**
@@ -142,6 +155,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 状态
      */
+    @Excel(name = "审核状态",width = 25,orderNum = "13")
     private String status;
 
     /**
@@ -184,5 +198,35 @@ public class CwWorkClientBaseDTO extends BaseDTO {
      */
     private String projectId;
 
+    /**
+     * 是否上市
+     */
+    @Excel(name = "是否上市",width = 25,orderNum = "6")
+    private String isListed;
+
+    /**
+     * 按所有制性质分类
+     */
+    @Excel(name = "按所有制性质分类",width = 25,orderNum = "8")
+    private String ownershipType;
+
+    /**
+     * 按最终地位分类
+     */
+    @Excel(name = "按最终地位分类",width = 25,orderNum = "9")
+    private String finalStatusType;
+
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人",width = 25,orderNum = "11")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "12")
+    private Date createDateT;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwWorkClientTypeDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.workClientInfo.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;