1、优化企业用户导出

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseUserBindController.java

@@ -84,10 +84,10 @@ public class EnterpriseUserBindController {
     public void exportEnterpriseUserBindExcel(@Valid EnterpriseUserBindPageReqVO pageReqVO,
                                               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<EnterpriseUserBindDO> list = enterpriseUserBindService.getEnterpriseUserBindPage(pageReqVO).getList();
+        List<EnterpriseUserBindDetailRespVO> list = enterpriseUserBindService.page(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "企业登录用户.xls", "数据", EnterpriseUserBindRespVO.class,
-                BeanUtils.toBean(list, EnterpriseUserBindRespVO.class));
+        ExcelUtils.write(response, "企业登录用户.xls", "数据", EnterpriseUserBindDetailRespVO.class,
+                BeanUtils.toBean(list, EnterpriseUserBindDetailRespVO.class));
     }
 
     @GetMapping("/list")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindDetailRespVO.java

@@ -17,7 +17,8 @@ import static com.citu.module.menduner.system.enums.DictTypeConstants.USER_TYPE;
 @ExcelIgnoreUnannotated
 public class EnterpriseUserBindDetailRespVO extends EnterpriseUserBindRespVO{
 
-    @Schema(description = "企业姓名", example = "616")
+    @ExcelProperty("企业名称")
+    @Schema(description = "企业名称", example = "616")
     private String enterpriseName;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindPageReqVO.java

@@ -1,10 +1,13 @@
 package com.citu.module.menduner.system.controller.base.enterprise.bind;
 
 
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -49,4 +52,8 @@ public class EnterpriseUserBindPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "登录时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] loginDate;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindRespVO.java

@@ -34,9 +34,9 @@ public class EnterpriseUserBindRespVO {
     @ExcelProperty("名称")
     private String name;
 
-    @Schema(description = "用户性别")
-    @ExcelProperty("用户性别")
-    private String sex;
+//    @Schema(description = "用户性别")
+//    @ExcelProperty("用户性别")
+//    private String sex;
 
     @Schema(description = "头像地址")
     @ExcelProperty("头像地址")
@@ -54,8 +54,8 @@ public class EnterpriseUserBindRespVO {
     @ExcelProperty("用户邮箱")
     private String email;
 
-    @Schema(description = "密码")
-    private String password;
+//    @Schema(description = "密码")
+//    private String password;
 
     @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "帐号状态（0正常 1停用 2 等待审核 3不通过）", converter = DictConvert.class)

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterprisePageReqVO.java

@@ -44,4 +44,8 @@ public class EnterprisePageReqVO extends PageParam {
     @Schema(description = "帐号状态（0正常 1停用）")
     private String status;
 
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseRespVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.citu.framework.excel.core.annotations.DictFormat;
 import com.citu.framework.excel.core.convert.DictConvert;
+import com.citu.framework.excel.core.convert.JsonConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -30,8 +31,6 @@ public class EnterpriseRespVO {
     @ExcelProperty("企业全称")
     private String name;
 
-//    private String en
-
     @Schema(description = "企业别称", example = "xx科技")
     @ExcelProperty("企业别称")
     private String anotherName;
@@ -71,15 +70,15 @@ public class EnterpriseRespVO {
     private String scale;
 
     @Schema(description = "企业福利")
-    @ExcelProperty("企业福利")
+    @ExcelProperty(value = "企业福利", converter = JsonConvert.class)
     private List<String> welfareList;
 
     @Schema(description = "企业标签")
-    @ExcelProperty("企业标签")
+    @ExcelProperty(value = "企业标签", converter = JsonConvert.class)
     private List<String> tagList;
 
     @Schema(description = "企业相册")
-    @ExcelProperty("企业相册")
+    @ExcelProperty(value = "企业相册", converter = JsonConvert.class)
     private List<String> albumList;
 
     @Schema(description = "上班时间")
@@ -103,7 +102,7 @@ public class EnterpriseRespVO {
     private Boolean prepare;
 
     @Schema(description = "允许企业发布哪些职位类型")
-    @ExcelProperty("允许企业发布哪些职位类型")
+    @ExcelProperty(value = "允许企业发布哪些职位类型", converter = JsonConvert.class)
     private List<String> pubJobTypePerm;
 
     @Schema(description = "状态（0正常 1停用）")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -66,6 +66,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         query.eqIfPresent(EnterpriseDO::getIndustryId, reqVO.getIndustryId());
         query.eqIfPresent(EnterpriseDO::getFinancingStatus, reqVO.getFinancingStatus());
         query.eqIfPresent(EnterpriseDO::getScale, reqVO.getScale());
+        query.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime());
         query.orderByDesc(EnterpriseDO::getId);
         return selectJoinPage(reqVO, EnterpriseDetailRespVO.class, query);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserBindMapper.java

@@ -40,6 +40,8 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
                 .likeIfPresent(EnterpriseUserBindDO::getPhone, reqVO.getPhone())
                 .likeIfPresent(EnterpriseUserBindDO::getEmail, reqVO.getEmail())
                 .likeIfPresent(EnterpriseUserBindDO::getName, reqVO.getName())
+                .betweenIfPresent(EnterpriseUserBindDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(EnterpriseUserBindDO::getLoginDate, reqVO.getLoginDate())
                 .orderByDesc(EnterpriseUserBindDO::getId));
     }
 
@@ -76,6 +78,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         wrapper.eqIfPresent(EnterpriseUserBindDO::getStatus, reqVO.getStatus());
         wrapper.eqIfPresent(EnterpriseUserBindDO::getLoginIp, reqVO.getLoginIp());
         wrapper.betweenIfPresent(EnterpriseUserBindDO::getCreateTime, reqVO.getCreateTime());
+        wrapper.betweenIfPresent(EnterpriseUserBindDO::getLoginDate, reqVO.getLoginDate());
         wrapper.orderByDesc(EnterpriseUserBindDO::getId);
         return selectJoinPage(reqVO, EnterpriseUserBindDetailRespVO.class, wrapper);