diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java new file mode 100644 index 0000000..449f8cf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java @@ -0,0 +1,71 @@ +package com.ruoyi.web.controller.system.system; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.service.ISysUserService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * packageName com.ruoyi.web.controller.system.system + * + * @author wangxy + * @version JDK 8 + * @className SysUserApplyController + * @date 2024/8/5 + * @description 人员申请 + */ +@Controller +@RequestMapping("/system/userApply") +public class SysUserApplyController extends BaseController { + + + @Autowired + private ISysUserService userService; + + + private String prefix = "system/user/userApply"; + + + @RequiresPermissions("system:userApply:view") + @GetMapping() + public String apply() + { + return prefix + "/userApply"; + } + + /** + * 人员申请列表 + * @param user + * @return + */ + @RequiresPermissions("system:userApply:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysUser user) + { + startPage(); + user.setExamine("2"); + List list = userService.selectUserList(user); + return getDataTable(list); + } + + + @GetMapping("/apply/{userId}") + public AjaxResult userExamine(@PathVariable("userId") Long userId) { + boolean update= userService.lambdaUpdate() + .eq(SysUser::getUserId, userId) + .set(SysUser::getExamine, "3").update(); + return toAjax(update); + + } + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java index f3dbd97..c1abd23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java @@ -53,6 +53,7 @@ public class SysUserExamineController extends BaseController { public TableDataInfo list(SysUser user) { startPage(); + user.setExamine("3"); List list = userService.selectUserList(user); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index df0cb54..17bcc81 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -93,7 +93,7 @@ var editFlag = [[${@permission.hasPermi('system:user:edit')}]]; var removeFlag = [[${@permission.hasPermi('system:user:remove')}]]; var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]]; - var examineState = [[${@dict.getType('sys_examine_state')}]]; + var examineState = [[${@dict.getType('sys_user_examine')}]]; var prefix = ctx + "system/user"; $(function() { diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userApply/userApply.html b/ruoyi-admin/src/main/resources/templates/system/user/userApply/userApply.html new file mode 100644 index 0000000..fd5a6ab --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/user/userApply/userApply.html @@ -0,0 +1,135 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+ + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html index 7f21678..1df444d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html @@ -19,7 +19,7 @@
  • - @@ -47,7 +47,7 @@ var downloadFlag = [[${@permission.hasPermi('system:userexamine:examine')}]]; var userStatus = [[${@dict.getType('sys_normal_disable')}]]; var userPolitics = [[${@dict.getType('sys_user_politics')}]]; - var examineState = [[${@dict.getType('sys_examine_state')}]]; + var examineState = [[${@dict.getType('sys_user_examine')}]]; var prefix = ctx + "system/userexamine"; $(function() {