diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java index 17555b5..24b3cf7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @Controller -@RequestMapping("/") +@RequestMapping("/system/userExamine") public class SysUserExamineController extends BaseController { + } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 3e75e2b..a67f3ba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -196,6 +196,22 @@ public class SysUser extends BaseEntity @Excel(name = "健康状况") private String helthy; + /** 审核状态 */ + @Excel(name = "审核状态") + private String examine; + + public SysUser(String examine) { + this.examine = examine; + } + + public String getExamine() { + return examine; + } + + public void setExamine(String examine) { + this.examine = examine; + } + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @@ -495,6 +511,7 @@ public class SysUser extends BaseEntity ", startdate='" + startdate + '\'' + ", enddate='" + enddate + '\'' + ", helthy='" + helthy + '\'' + + ", examine='" + examine + '\'' + ", dept=" + dept + ", roles=" + roles + ", roleIds=" + Arrays.toString(roleIds) + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java index b703bea..439730f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdExamnum.java @@ -44,7 +44,7 @@ public class TdExamnum extends BaseEntity /** 试题类型 */ @Excel(name = "试题类型") - private String tyep; + private String type; public void setId(Long id) { @@ -100,14 +100,14 @@ public class TdExamnum extends BaseEntity { return dept; } - public void setTyep(String tyep) + public void setType(String type) { - this.tyep = tyep; + this.type = type; } - public String getTyep() + public String getType() { - return tyep; + return type; } @Override @@ -119,7 +119,7 @@ public class TdExamnum extends BaseEntity .append("startTime", getStartTime()) .append("endTime", getEndTime()) .append("dept", getDept()) - .append("tyep", getTyep()) + .append("type", getType()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml index 70bc8af..a31ec3e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdExamnumMapper.xml @@ -11,11 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select id, userName, examResult, startTime, endTime, dept, tyep from td_examnum + select id, userName, examResult, startTime, endTime, dept, type from td_examnum @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" startTime, endTime, dept, - tyep, + type, #{userName}, @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{startTime}, #{endTime}, #{dept}, - #{tyep}, + #{type}, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" startTime = #{startTime}, endTime = #{endTime}, dept = #{dept}, - tyep = #{tyep}, + type = #{type}, where id = #{id}