userexamine

pom.xml

@@ -190,6 +190,12 @@
                 <version>3.5.2</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.24</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

ruoyi-common/pom.xml

@@ -94,6 +94,11 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -5,20 +5,28 @@ import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
+import lombok.*;
 
 /**
  * 用户对象 sys_user
  * 
  * @author ruoyi
  */
+@Data
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
 public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -200,6 +208,30 @@ public class SysUser extends BaseEntity
     @Excel(name = "审核状态")
     private String examine;
 
+    /** 审核时间 */
+    @Excel(name = "审核时间")
+    private String examinedate;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String examineuser;
+
+    public String getExaminedate() {
+        return examinedate;
+    }
+
+    public void setExaminedate(String examinedate) {
+        this.examinedate = examinedate;
+    }
+
+    public String getExamineuser() {
+        return examineuser;
+    }
+
+    public void setExamineuser(String examineuser) {
+        this.examineuser = examineuser;
+    }
+
     public SysUser(String examine) {
         this.examine = examine;
     }
@@ -481,6 +513,22 @@ public class SysUser extends BaseEntity
         this.postIds = postIds;
     }
 
+    public String getStartdate() {
+        return startdate;
+    }
+
+    public void setStartdate(String startdate) {
+        this.startdate = startdate;
+    }
+
+    public String getEnddate() {
+        return enddate;
+    }
+
+    public void setEnddate(String enddate) {
+        this.enddate = enddate;
+    }
+
     @Override
     public String toString() {
         return "SysUser{" +
@@ -512,6 +560,8 @@ public class SysUser extends BaseEntity
                 ", enddate='" + enddate + '\'' +
                 ", helthy='" + helthy + '\'' +
                 ", examine='" + examine + '\'' +
+                ", examinedate='" + examinedate + '\'' +
+                ", examineuser='" + examineuser + '\'' +
                 ", dept=" + dept +
                 ", roles=" + roles +
                 ", roleIds=" + Arrays.toString(roleIds) +

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 /**
@@ -8,7 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
  * 
  * @author ruoyi
  */
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysUserRole;
 
@@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysUserRole;
  * 
  * @author ruoyi
  */
-public interface ISysUserService
+public interface ISysUserService extends IService<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +40,7 @@ import com.ruoyi.system.service.ISysUserService;
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper,SysUser> implements ISysUserService
 {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
@@ -551,4 +553,9 @@ public class SysUserServiceImpl implements ISysUserService
     {
         return userMapper.updateUser(user);
     }
+
+    @Override
+    public boolean save(SysUser entity) {
+        return super.save(entity);
+    }
 }