护工管理老师导出，excel宽度调整

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/vo/ManagementTeacherVo.java

@@ -27,6 +27,7 @@ import java.util.Date;
 @Data
 @ApiModel("管理老师信息视图对象")
 @ExcelIgnoreUnannotated
+@ContentRowHeight(20)
 public class ManagementTeacherVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -40,6 +41,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 姓名
      */
+    @ColumnWidth(15)
     @ExcelProperty(value = "姓名")
     @ApiModelProperty("姓名")
     private String name;
@@ -47,6 +49,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 手机号
      */
+    @ColumnWidth(20)
     @ExcelProperty(value = "手机号")
     @ApiModelProperty("手机号")
     private String phoneNumber;
@@ -54,7 +57,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 性别 1-男 2-女
      */
-    @ColumnWidth(50)
+    @ColumnWidth(10)
     @ExcelProperty(value = "性别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_user_sex")
     @ApiModelProperty("性别")
@@ -63,7 +66,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 年龄
      */
-    @ColumnWidth(50)
+    @ColumnWidth(10)
     @ExcelProperty(value = "年龄")
     @ApiModelProperty("年龄")
     private Integer age;
@@ -71,6 +74,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 工作年限
      */
+    @ColumnWidth(20)
     @ExcelProperty(value = "工作年限")
     @ApiModelProperty("工作年限")
     private Integer workYears;
@@ -85,6 +89,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 状态 0-启用 1-禁用
      */
+    @ColumnWidth(15)
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=启用,1=禁用")
     @ApiModelProperty("状态 0-启用 1-禁用")
@@ -93,7 +98,8 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 排序序号
      */
-    @ExcelProperty(value = "排序序号")
+    @ColumnWidth(20)
+//    @ExcelProperty(value = "排序序号")
     @ApiModelProperty("排序序号")
     private Integer sortOrder;
 
@@ -104,8 +110,8 @@ public class ManagementTeacherVo implements Serializable {
     @ApiModelProperty("形象照片url")
     private String photographUrl;
 
-
-    @ExcelProperty(value = "形象照片")
+    @ColumnWidth(10)
+    @ExcelProperty(value = "照片")
     private URL photograph;
 
     /**

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/NursingWorker.java

@@ -41,7 +41,7 @@ public class NursingWorker extends BaseEntity {
     /**
      * 年龄
      */
-    private String age;
+    private Integer age;
     /**
      * 工作年限
      */

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/bo/NursingWorkerBo.java

@@ -61,7 +61,7 @@ public class NursingWorkerBo extends BaseEntity {
      */
     @ApiModelProperty(value = "年龄", required = true)
     @NotNull(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String age;
+    private Integer age;
 
     /**
      * 工作年限

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingWorkerVo.java

@@ -2,6 +2,8 @@ package com.ruoyi.info.nursing.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -27,6 +29,7 @@ import java.util.List;
 @Data
 @ApiModel("护工信息视图对象")
 @ExcelIgnoreUnannotated
+@ContentRowHeight(20)
 public class NursingWorkerVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -40,6 +43,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 姓名
      */
+    @ColumnWidth(15)
     @ExcelProperty(value = "姓名")
     @ApiModelProperty("姓名")
     private String name;
@@ -47,6 +51,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 手机号
      */
+    @ColumnWidth(20)
     @ExcelProperty(value = "手机号")
     @ApiModelProperty("手机号")
     private String phoneNumber;
@@ -54,6 +59,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 性别
      */
+    @ColumnWidth(10)
     @ExcelProperty(value = "性别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_user_sex")
     @ApiModelProperty("性别 1-男 2-女")
@@ -62,13 +68,15 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 年龄
      */
+    @ColumnWidth(10)
     @ExcelProperty(value = "年龄")
     @ApiModelProperty("年龄")
-    private String age;
+    private Integer age;
 
     /**
      * 工作年限
      */
+    @ColumnWidth(18)
     @ExcelProperty(value = "工作年限")
     @ApiModelProperty("工作年限")
     private Integer workYears;
@@ -82,6 +90,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 常驻医院
      */
+    @ColumnWidth(25)
     @ExcelProperty(value = "常驻医院")
     @ApiModelProperty("常驻医院名称")
     private String hospitalName;
@@ -89,6 +98,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 身份证号
      */
+    @ColumnWidth(25)
     @ExcelProperty(value = "身份证号")
     @ApiModelProperty("身份证号")
     private String idCard;
@@ -96,6 +106,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 接单状态 0-正常 1-关闭
      */
+    @ColumnWidth(18)
     @ExcelProperty(value = "接单状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=关闭")
     @ApiModelProperty("接单状态 0-正常 1-关闭")
@@ -104,7 +115,8 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 用户状态 0-启用 1-禁用
      */
-    @ExcelProperty(value = "用户状态", converter = ExcelDictConvert.class)
+    @ColumnWidth(10)
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=禁用")
     @ApiModelProperty("用户状态 0-启用 1-禁用")
     private String enableStatus;
@@ -112,7 +124,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 排序序号
      */
-    @ExcelProperty(value = "排序序号")
+//    @ExcelProperty(value = "排序序号")
     @ApiModelProperty("排序序号")
     private Integer sortOrder;
 
@@ -126,7 +138,8 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 导出图片url
      */
-    @ExcelProperty(value = "形象照片")
+    @ColumnWidth(10)
+    @ExcelProperty(value = "照片")
     @ApiModelProperty("形象照片")
     private URL photograph;
 
@@ -137,6 +150,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 接单数量
      */
+    @ColumnWidth(18)
     @ExcelProperty(value = "接单数量")
     @ApiModelProperty("接单数量")
     private Integer orderCount = 0;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/service/impl/NursingWorkerServiceImpl.java

@@ -1,22 +1,18 @@
 package com.ruoyi.info.nursing.service.impl;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import javax.annotation.Resource;
 
 import org.springframework.context.annotation.Lazy;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
@@ -37,11 +33,8 @@ import com.ruoyi.info.nursing.mapper.NursingCertificateMapper;
 import com.ruoyi.info.nursing.mapper.NursingWorkerMapper;
 import com.ruoyi.info.nursing.service.INursingCertificateService;
 import com.ruoyi.info.nursing.service.INursingWorkerService;
-import com.ruoyi.user.domain.User;
-import com.ruoyi.user.service.IUserService;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;