流程效率、业务统计、客户、人力导入导出

dq-financial-crms/pom.xml

@@ -24,6 +24,7 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-api</artifactId>
@@ -65,6 +66,12 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.8.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.3.4.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java

@@ -68,7 +68,7 @@ public class CompanyCustomerRequest implements Serializable {
     @ApiModelProperty(value = "联系人")
     private String linkman;
 
-    @ApiModelProperty(value = "联系人的联系电话")
+    @ApiModelProperty(value = "联系人电话")
     private String linkPhone;
 
     @ApiModelProperty(value = "经营地址")

dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml

@@ -33,9 +33,7 @@
 
     <!-- 根据客户基本信息id查询企业类型客户的信息 -->
     <select id="queryCompanyCustomerById" parameterType="long" resultType="com.daqing.framework.domain.crms.CompanyCustomerEntity">
-        SELECT registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source
+        SELECT *
-               business_addr,register_time,register_addr,legal_id_number,legal_hukou_addr,legal_phone,legal_home_addr,
-               legal_gender,legal_name
         FROM crms_company_customer
         WHERE customer_id = #{id}
     </select>

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java

@@ -39,6 +39,7 @@ public class DgEfficiencyController {
     @PostMapping("/team")
     @ApiOperation(value = "团队效率", notes = "团队效率")
     public ResponseResult queryList(@RequestBody DgEfficiencyTeamRequest dgEfficiencyTeamRequest) {
+
         return ResponseResult.SUCCESS(dgEfficiencyService.queryList(dgEfficiencyTeamRequest));
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java

@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @RequestMapping("/guarantee/statistics")
-@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法")
+@Api(value = "担保业务统计", tags = "提供业务统计增删改查的方法")
 public class DgStatisticsController {
 
     @Autowired
@@ -33,18 +33,18 @@ public class DgStatisticsController {
      * 列表
      */
     @GetMapping("/list")
-    @ApiOperation(value = "业务统计列表",notes = "业务统计列表",response = DgStatisticsListResponse.class)
+    @ApiOperation(value = "业务统计列表", notes = "业务统计列表", response = DgStatisticsListResponse.class)
     public ResponseResult list(@RequestParam("page") Integer page,
                                @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) {
-        return ResponseResult.SUCCESS(iDgStatisticsService.list(page,size,dgStatisticsRequest));
+        return ResponseResult.SUCCESS(iDgStatisticsService.list(page, size, dgStatisticsRequest));
     }
 
     /**
      * 列表导出
      */
-    @ApiOperation(value = "统计列表导出",notes = "统计列表导出")
+    @ApiOperation(value = "统计列表导出", notes = "统计列表导出")
     @GetMapping("/excelExport")
-    public ResponseResult excelExport(HttpServletResponse response){
+    public ResponseResult excelExport(HttpServletResponse response) {
 
         Boolean result = iDgStatisticsService.excelExport(response);
 
@@ -55,18 +55,18 @@ public class DgStatisticsController {
      * 拒绝列表
      */
     @GetMapping("/listRefuse")
-    @ApiOperation(value = "业务统计拒绝列表",notes = "业务统计拒绝列表",response = DgStatisticsListRefuseResponse.class)
+    @ApiOperation(value = "业务统计拒绝列表", notes = "业务统计拒绝列表", response = DgStatisticsListRefuseResponse.class)
     public ResponseResult listRefuse(@RequestParam("page") Integer page,
-                               @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) {
+                                     @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) {
-        return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page,size,dgStatisticsRequest));
+        return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page, size, dgStatisticsRequest));
     }
 
     /**
      * 拒绝列表导出
      */
-    @ApiOperation(value = "统计拒绝列表导出",notes = "统计拒绝列表导出")
+    @ApiOperation(value = "统计拒绝列表导出", notes = "统计拒绝列表导出")
     @GetMapping("/excelExportRefuse")
-    public ResponseResult excelExportRefuse(HttpServletResponse response){
+    public ResponseResult excelExportRefuse(HttpServletResponse response) {
 
         Boolean result = iDgStatisticsService.excelExportRefuse(response);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java

@@ -0,0 +1,76 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 业务统计拒绝列表导出到excel实体类
+ *
+ * @auther River
+ * @date 2021/1/4 15:11
+ */
+@Data
+@ToString
+public class DgStatisticsExcelRefuseResponse  extends BaseRowModel implements Serializable {
+
+    @ApiModelProperty("业务编号")
+    @ExcelProperty(value = "业务编号",index = 0)
+    private String businessCode;
+
+    @ApiModelProperty("客户姓名")
+    @ExcelProperty(value = "客户姓名",index = 1)
+    private String name;
+
+    @ApiModelProperty("客户联系方式")
+    @ExcelProperty(value = "联系电话",index = 2)
+    private String phone;
+
+    @ApiModelProperty("业务类型")
+    @ExcelProperty(value = "产品类型",index = 3)
+    private String businessType;
+
+    @ApiModelProperty("申请额度")
+    @ExcelProperty(value = "金额",index = 4)
+    private Double applyAmount;
+
+    @ApiModelProperty("申请期限")
+    @ExcelProperty(value = "期数",index = 5)
+    private String applyTime;
+
+    @ApiModelProperty("申请日期")
+    @ExcelProperty(value = "申请日期",index = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty("拒绝人")
+    @ExcelProperty(value = "当前审批人",index = 7)
+    private String refuseName;
+
+    @ApiModelProperty("拒绝节点id")
+    @ExcelProperty(value = "任务节点",index = 8)
+    private Integer processId;
+
+    @ApiModelProperty("拒绝时间")
+    @ExcelProperty(value = "拒绝时间",index = 9)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date refuseTime;
+
+    @ApiModelProperty("拒绝原因")
+    @ExcelProperty(value = "拒绝原因",index = 10)
+    private String refuseOpinion;
+
+    @ApiModelProperty("提单人姓名")
+    @ExcelProperty(value = "提单人",index = 11)
+    private String employeeName;
+
+    @ApiModelProperty("部门")
+    @ExcelProperty(value = "所属部门",index = 12)
+    private String department;
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java

@@ -0,0 +1,69 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 业务统计列表导出到excel实体类
+ *
+ * @auther River
+ * @date 2021/1/4 14:48
+ */
+@Data
+@ToString
+public class DgStatisticsExcelResponse extends BaseRowModel implements Serializable {
+
+    @ApiModelProperty("业务编号")
+    @ExcelProperty(value = "业务编号",index = 0)
+    private String businessCode;
+
+    @ApiModelProperty("客户姓名")
+    @ExcelProperty(value = "客户姓名",index = 1)
+    private String name;
+
+    @ApiModelProperty("客户联系方式")
+    @ExcelProperty(value = "联系电话",index = 2)
+    private String phone;
+
+    @ApiModelProperty("业务类型")
+    @ExcelProperty(value = "产品类型",index = 3)
+    private String businessType;
+
+    @ApiModelProperty("申请额度")
+    @ExcelProperty(value = "金额",index = 4)
+    private Double applyAmount;
+
+    @ApiModelProperty("申请期限")
+    @ExcelProperty(value = "期数",index = 5)
+    private String applyTime;
+
+    @ApiModelProperty("申请日期")
+    @ExcelProperty(value = "申请日期",index = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty("完成任务节点id")
+    @ExcelProperty(value = "完成任务节点id",index = 7)
+    private Integer processId;
+
+    @ApiModelProperty("最新操作时间")
+    @ExcelProperty(value = "任务分配时间",index = 8)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date operationTime;
+
+    @ApiModelProperty("提单人姓名")
+    @ExcelProperty(value = "提单人",index = 9)
+    private String employeeName;
+
+    @ApiModelProperty("部门")
+    @ExcelProperty(value = "所属部门",index = 10)
+    private String department;
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java

@@ -6,9 +6,12 @@ import com.daqing.framework.utils.excel.ApprovalStatusConverter;
 import com.daqing.framework.utils.excel.BusinessStatusConverter;
 import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.daqing.framework.utils.excel.TaskNodeConverter;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author chen
  * @DATE 2020/12/28 16:31

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 
 import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -147,6 +148,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
 
     /**
      * 查询审批数目的值的数组
+     *
      * @return
      */
     @Override
@@ -155,12 +157,12 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         //String userId = dgApplyAmountInfoController.getUserId();
         String userId = "5";
         //近十天的日期数组
-        List<String>timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId));
+        List<String> timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId));
         //近十天审批数目的值的数组
-        List<Integer>approvalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId));
+        List<Integer> approvalList = dgAuditProcessMapper.selectApprovalNum(Integer.parseInt(userId));
         Map map = new HashMap();
-        map.put("timeArr",timeList);
+        map.put("timeArr", timeList);
-        map.put("approvalNumArr",approvalList);
+        map.put("approvalNumArr", approvalList);
         return map;
     }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgStatisticsMapper;
 import com.daqing.financial.guarantee.model.request.DgStatisticsRequest;
+import com.daqing.financial.guarantee.model.response.DgStatisticsExcelRefuseResponse;
+import com.daqing.financial.guarantee.model.response.DgStatisticsExcelResponse;
 import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse;
 import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse;
 import com.daqing.financial.guarantee.service.IDgStatisticsService;
@@ -130,8 +132,25 @@ public class DgStatisticsServiceImpl extends ServiceImpl<DgStatisticsMapper, DgA
             ResponseResult<List<EmployeeTO>> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids);
             if (empAndDeptList.getData() != null) {
                 List<DgStatisticsListResponse> listResponse = this.jointStatistics(dgStatisticsPOList, empAndDeptList.getData());
+                List<DgStatisticsExcelResponse> excelResponse = new ArrayList<>();
+                for (DgStatisticsListResponse dgStatisticsListResponse : listResponse) {
+                    DgStatisticsExcelResponse dgStatisticsExcelResponse = new DgStatisticsExcelResponse();
+                    StringBuilder stringBuilder = new StringBuilder();
+                    if (dgStatisticsListResponse.getDepartment() != null && dgStatisticsListResponse.getDepartment().size() != 0) {
+                        for (int i = 0; i < dgStatisticsListResponse.getDepartment().size(); i++) {
+                            if (i == dgStatisticsListResponse.getDepartment().size() - 1) {
+                                stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i));
+                            } else {
+                                stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)).append(",");
+                            }
+                        }
+                    }
+                    dgStatisticsExcelResponse.setDepartment(stringBuilder.toString());
+                    BeanUtils.copyProperties(dgStatisticsListResponse, dgStatisticsExcelResponse);
+                    excelResponse.add(dgStatisticsExcelResponse);
+                }
                 try {
-                    ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计信息一览表", "statistics", new DgStatisticsListResponse())
+                    ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计信息一览表", "statistics", new DgStatisticsExcelResponse())
                             .finish();
                 } catch (Exception e) {
                     ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
@@ -255,18 +274,34 @@ public class DgStatisticsServiceImpl extends ServiceImpl<DgStatisticsMapper, DgA
             if (empAndDeptList.getData() != null) {
                 // 提单人姓名、部门拼装
                 List<DgStatisticsListRefuseResponse> listResponse = this.jointRefuseStatistics(statisticsRefusePOList, empAndDeptList.getData());
+                List<DgStatisticsExcelRefuseResponse> excelResponse = new ArrayList<>();
+                for (DgStatisticsListRefuseResponse listRefuseResponse : listResponse) {
+                    DgStatisticsExcelRefuseResponse excelRefuseResponse = new DgStatisticsExcelRefuseResponse();
+                    StringBuilder stringBuilder = new StringBuilder();
+                    if (listRefuseResponse.getDepartment() != null && listRefuseResponse.getDepartment().size() != 0) {
+                        for (int i = 0; i < listRefuseResponse.getDepartment().size(); i++) {
+                            if (i == listRefuseResponse.getDepartment().size() - 1) {
+                                stringBuilder.append(listRefuseResponse.getDepartment().get(i));
+                            } else {
+                                stringBuilder.append(listRefuseResponse.getDepartment().get(i)).append(",");
+                            }
+                        }
+                    }
+                    excelRefuseResponse.setDepartment(stringBuilder.toString());
+                    BeanUtils.copyProperties(listRefuseResponse, excelRefuseResponse);
+                    excelResponse.add(excelRefuseResponse);
+                }
                 try {
-                    ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsListRefuseResponse())
+                    ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsExcelRefuseResponse())
                             .finish();
                 } catch (Exception e) {
                     ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
                 }
-                return true;
-            } else {
-                return false;
             }
+            return false;
+        } else {
+            return false;
         }
-        return false;
     }
 
     private List<DgStatisticsListResponse> jointStatistics(List<DgStatisticsPO> dgStatisticsPOList, List<EmployeeTO> empAndDeptList) {

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java

@@ -13,6 +13,7 @@ import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
 import com.daqing.framework.domain.hrms.*;
 import com.daqing.framework.domain.hrms.ext.*;
 import com.daqing.framework.domain.hrms.request.EmployeeRequest;
+import com.daqing.framework.domain.hrms.response.EmployeeExcelResponse;
 import com.daqing.framework.domain.hrms.response.HrmsCode;
 import com.daqing.framework.domain.hrms.response.RolePermissionResponse;
 import com.daqing.framework.exception.ExceptionCast;
@@ -402,7 +403,46 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
     public Boolean excelExport(HttpServletResponse response) {
         try {
             List<EmployeeListVO> list = this.getBaseMapper().excelList();
-            ExcelUtil.writeExcelWithSheets(response, list, "员工信息一览表", "employee", new EmployeeListVO())
+            List<EmployeeExcelResponse> excelResponse = new ArrayList<>();
+            for (EmployeeListVO employee : list) {
+                EmployeeExcelResponse employeeExcelResponse = new EmployeeExcelResponse();
+                if (employee.getDepartmentNameList() != null && employee.getDepartmentNameList().size() != 0) {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    for (int i = 0; i < employee.getDepartmentNameList().size(); i++) {
+                        if (i == employee.getDepartmentNameList().size() - 1) {
+                            stringBuilder.append(employee.getDepartmentNameList().get(i));
+                        } else {
+                            stringBuilder.append(employee.getDepartmentNameList().get(i)).append(",");
+                        }
+                    }
+                    employeeExcelResponse.setDepartmentNameList(stringBuilder.toString());
+                }
+                if (employee.getPositionNameList() != null && employee.getPositionNameList().size() != 0) {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    for (int i = 0; i < employee.getPositionNameList().size(); i++) {
+                        if (i == employee.getPositionNameList().size() - 1) {
+                            stringBuilder.append(employee.getPositionNameList().get(i));
+                        } else {
+                            stringBuilder.append(employee.getPositionNameList().get(i)).append(",");
+                        }
+                    }
+                    employeeExcelResponse.setPositionNameList(stringBuilder.toString());
+                }
+                if (employee.getRoleNameList() != null && employee.getRoleNameList().size() != 0) {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    for (int i = 0; i < employee.getRoleNameList().size(); i++) {
+                        if (i == employee.getRoleNameList().size() - 1) {
+                            stringBuilder.append(employee.getRoleNameList().get(i));
+                        } else {
+                            stringBuilder.append(employee.getRoleNameList().get(i)).append(",");
+                        }
+                    }
+                    employeeExcelResponse.setRoleNameList(stringBuilder.toString());
+                }
+                BeanUtils.copyProperties(employee, employeeExcelResponse);
+                excelResponse.add(employeeExcelResponse);
+            }
+            ExcelUtil.writeExcelWithSheets(response, excelResponse, "员工信息一览表", "employee", new EmployeeExcelResponse())
                     .finish();
             return true;
         } catch (Exception e) {

dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

@@ -98,9 +98,9 @@ public class PromptSuccess {
 
     public static final String DB_B_NAME = "担保部B角"; // 担保部B角
 
-    public static final String PERSONAL_START_CODE = "DQCZ-0001";
+    public static final String PERSONAL_START_CODE = "DQCZ-0000";
 
-    public static final String COMPANY_START_CODE = "DQCQ-0001";
+    public static final String COMPANY_START_CODE = "DQCQ-0000";
 
     public static final String PERSONAL_CODE = "DQCZ-";
 

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java

@@ -6,10 +6,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 导出excel模板(企业类型)
+ *
  * @auther River
  * @date 2020/10/9 11:38
  */
@@ -19,93 +23,64 @@ public class CompanyTemplate extends BaseRowModel implements Serializable {
     /**
      * 客户经理
      */
-    @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)",index = 0)
+    @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)", index = 0)
     private String manager;
     /**
      * 客户名称
      */
-    @ExcelProperty(value = "姓名",index = 1)
+    @ExcelProperty(value = "客户名称", index = 1)
     private String name;
-    /**
+
-     * 联系地址
+    @ExcelProperty(value = "社会统一代码", index = 2)
-     */
+    private String socialUnifiedCode;
-    @ExcelProperty(value = "地址",index = 2)
+
-    private String addr;
+    @ExcelProperty(value = "联系电话", index = 3)
-    /**
-     * 联系电话
-     */
-    @ExcelProperty(value = "电话",index = 3)
     private String phone;
-    /**
+
-     * 注册资金
+    @ExcelProperty(value = "注册时间(eg:2020-02-20)", index = 4)
-     */
+    private Date registerTime;
-    @ExcelProperty(value = "注册资金",index = 4)
+
+    @ExcelProperty(value = "注册资金", index = 5)
     private String registeredCapital;
-    /**
+
-     * 所属行业
+    @ExcelProperty(value = "员工人数", index = 6)
-     */
-    @ExcelProperty(value = "所属行业",index = 5)
-    private String industry;
-    /**
-     * 成立年限
-     */
-    @ExcelProperty(value = "成立年限",index = 6)
-    private Integer years;
-    /**
-     * 所在区域
-     */
-    @ExcelProperty(value = "所在区域",index = 7)
-    private String region;
-    /**
-     * 股东名称
-     */
-    @ExcelProperty(value = "股东名称",index = 8)
-    private String shareholder;
-    /**
-     * 关联企业
-     */
-    @ExcelProperty(value = "关联企业",index = 9)
-    private String affiliatedCompany;
-    /**
-     * 员工个数
-     */
-    @ExcelProperty(value = "员工个数",index = 10)
     private String empNum;
-    /**
+
-     * 联系人
+    @ExcelProperty(value = "注册地址", index = 7)
-     */
+    private String registerAddr;
-    @ExcelProperty(value = "联系人",index = 11)
+
+    @ExcelProperty(value = "联系人", index = 8)
     private String linkman;
-    /**
+
-     * 业务来源
+    @ExcelProperty(value = "联系人的联系电话", index = 9)
-     */
+    private String linkPhone;
-    @ExcelProperty(value = "业务来源",index = 12)
+
+    @ExcelProperty(value = "经营地址", index = 10)
+    private String businessAddr;
+
+    @ExcelProperty(value = "业务来源", index = 11)
     private String businessSource;
 
-    /**
+    @ExcelProperty(value = "经营范围", index = 12)
-     * 经营范围
-     */
-    @ExcelProperty(value = "经营范围",index = 13)
     private String businessScope;
-
     /**
      * 法人-姓名
      */
-    @ExcelProperty(value = "法人-姓名",index = 14)
+    @ExcelProperty(value = "法人-姓名", index = 13)
     private String legalName;
 
-    @ExcelProperty(value = "法人-性别 1、男，0、女",index = 15)
+    @ExcelProperty(value = "法人-性别 1、男，0、女", index = 14)
     private Integer legalGender;
 
-    @ExcelProperty(value = "法人-身份证号",index = 16)
+    @ExcelProperty(value = "法人-身份证号", index = 15)
     private String legalIdNumber;
 
-    @ExcelProperty(value = "法人-户口所在地",index = 17)
+    @ExcelProperty(value = "法人-户口所在地", index = 16)
     private String legalHukouAddr;
 
-    @ExcelProperty(value = "法人-联系电话",index = 18)
+    @ExcelProperty(value = "法人-联系电话", index = 17)
     private String legalPhone;
 
-    @ExcelProperty(value = "法人-家庭住址",index = 19)
+    @ExcelProperty(value = "法人-家庭住址", index = 18)
     private String legalHomeAddr;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java

@@ -35,89 +35,55 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable {
      */
     @ExcelProperty(value = "姓名",index = 2)
     private String name;
-    /**
+
-     * 联系地址
+    @ExcelProperty(value = "社会统一代码", index = 3)
-     */
+    private String socialUnifiedCode;
-    @ExcelProperty(value = "地址",index = 3)
+
-    private String addr;
+    @ExcelProperty(value = "联系电话", index = 4)
-    /**
-     * 联系电话
-     */
-    @ExcelProperty(value = "电话",index = 4)
     private String phone;
-    /**
+
-     * 注册资金
+    @ExcelProperty(value = "注册时间", index = 5)
-     */
+    private Date registerTime;
-    @ExcelProperty(value = "注册资金",index = 5)
+
+    @ExcelProperty(value = "注册资金", index = 6)
     private String registeredCapital;
-    /**
+
-     * 所属行业
+    @ExcelProperty(value = "员工人数", index = 7)
-     */
-    @ExcelProperty(value = "所属行业",index = 6)
-    private String industry;
-    /**
-     * 成立年限
-     */
-    @ExcelProperty(value = "成立年限",index = 7)
-    private Integer years;
-    /**
-     * 所在区域
-     */
-    @ExcelProperty(value = "所在区域",index = 8)
-    private String region;
-    /**
-     * 股东名称
-     */
-    @ExcelProperty(value = "股东名称",index = 9)
-    private String shareholder;
-    /**
-     * 关联企业
-     */
-    @ExcelProperty(value = "关联企业",index = 10)
-    private String affiliatedCompany;
-    /**
-     * 员工个数
-     */
-    @ExcelProperty(value = "员工个数",index = 11)
     private String empNum;
-    /**
+
-     * 联系人
+    @ExcelProperty(value = "注册地址", index = 8)
-     */
+    private String registerAddr;
-    @ExcelProperty(value = "联系人",index = 12)
+
+    @ExcelProperty(value = "联系人", index = 9)
     private String linkman;
-    /**
-     * 业务来源
-     */
-    @ExcelProperty(value = "业务来源",index = 13)
-    private String businessSource;
 
-    @ExcelProperty(value = "经营范围",index = 14)
+    @ExcelProperty(value = "联系人的联系电话", index = 10)
-    private String businessScope;
+    private String linkPhone;
 
-    @ExcelProperty(value = "经营地址",index = 15)
+    @ExcelProperty(value = "经营地址", index = 11)
     private String businessAddr;
 
-    @ExcelProperty(value = "注册时间",index = 16)
+    @ExcelProperty(value = "业务来源", index = 12)
-    private Date registerTime;
+    private String businessSource;
 
-    @ExcelProperty(value = "注册地址",index = 17)
+    @ExcelProperty(value = "经营范围", index = 13)
-    private String registerAddr;
+    private String businessScope;
 
-    @ExcelProperty(value = "法人-身份证号",index = 18)
+    @ExcelProperty(value = "法人-身份证号",index = 14)
     private String legalIdNumber;
 
-    @ExcelProperty(value = "法人-户口所在地",index = 19)
+    @ExcelProperty(value = "法人-户口所在地",index = 15)
     private String legalHukouAddr;
 
-    @ExcelProperty(value = "法人-联系电话",index = 20)
+    @ExcelProperty(value = "法人-联系电话",index = 16)
     private String legalPhone;
 
-    @ExcelProperty(value = "法人-家庭住址",index = 21)
+    @ExcelProperty(value = "法人-家庭住址",index = 17)
     private String legalHomeAddr;
 
-    @ExcelProperty(value = "法人-性别 1、男，0、女",index = 22)
+    @ExcelProperty(value = "法人-性别 1、男，0、女",index = 18)
     private Integer legalGender;
 
-    @ExcelProperty(value = "法人-姓名",index = 23)
+    @ExcelProperty(value = "法人-姓名",index = 19)
     private String legalName;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java

@@ -0,0 +1,53 @@
+package com.daqing.framework.domain.hrms.response;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import org.springframework.data.annotation.Transient;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 员工列表导出到excel实体类
+ *
+ * @auther River
+ * @date 2021/1/4 15:27
+ */
+@Data
+@ToString
+public class EmployeeExcelResponse  extends BaseRowModel implements Serializable {
+
+    @ApiModelProperty("姓名")
+    @ExcelProperty(value = "姓名",index = 0)
+    private String name;
+
+    @ExcelProperty(value = "账号",index = 1)
+    @ApiModelProperty("账号")
+    private String account;
+
+    @ExcelProperty(value = "工号",index = 2)
+    @ApiModelProperty("工号")
+    private String jobNumber;
+
+    @ExcelProperty(value = "部门",index = 3)
+    @ApiModelProperty("部门")
+    @Transient
+    private String departmentNameList;
+
+    @ExcelProperty(value = "职位",index = 4)
+    @ApiModelProperty("职位")
+    private String positionNameList;
+
+    @ExcelProperty(value = "角色",index = 5)
+    @ApiModelProperty("角色")
+    private String roleNameList;
+
+    @ExcelProperty(value = "创建时间",index = 6)
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+}