diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index 3718438..12e5b79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -1,12 +1,15 @@ package com.ruoyi.web.controller.system.count; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; @@ -16,6 +19,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -33,6 +37,8 @@ public class SysUsernumController extends BaseController { private ISysPostService postService; @Autowired private ISysRoleService roleService; + @Autowired + private ISysDeptService deptService; @RequiresPermissions("system:usernum:view") @GetMapping() @@ -49,11 +55,20 @@ public class SysUsernumController extends BaseController { @RequiresPermissions("system:usernum:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysUser user) + public TableDataInfo list(SysUser user,SysDept dept) { startPage(); - List list = userService.selectUserList(user); - return getDataTable(list); + List sysuser = new ArrayList<>(); + List list = userService.selectUserGroupBydept(user); + List sysDepts = deptService.selectDeptList(dept); + for (SysDept Dept : sysDepts){ + for ( SysUser user1 : list){ + if (Dept.getDeptName().equals(user1.getDept().getDeptName())){ + sysuser.add(user1); + } + } + } + return getDataTable(sysuser); } /** @@ -72,29 +87,22 @@ public class SysUsernumController extends BaseController { return util.exportExcel(list, "用户统计数据"); } - /** - * 用户详情 - * @param userId - * @param mmap - * @return - */ - @RequiresPermissions("system:usernum:detail") - @GetMapping("/detail/{userId}") - public String detail(@PathVariable("userId") Long userId, ModelMap mmap){ - mmap.put("user",userService.selectUserById(userId)); - mmap.put("role",roleService.selectRolesByUserIds(userId)); - mmap.put("post",postService.selectPostsByUserIds(userId)); - return prefix + "/detail"; - } - /** * 打印 */ - @RequiresPermissions("system:usernum:print") - @PostMapping("/print") - @ResponseBody - public AjaxResult print(SysUser user){ + @RequiresPermissions("system:usernum:detail") + @GetMapping("/print/{deptId}") + public String print(@PathVariable("deptId")String deptId, SysUser user,ModelMap mmap) + { List sysUsers = userService.selectUserList(user); - return AjaxResult.success(sysUsers); + List list = new ArrayList<>(); + for (SysUser User : sysUsers){ + if (User.getDept().getDeptId().equals(deptId)){ + list.add(User); + } + } + mmap.put("list", list); + mmap.put("sysuser",getSysUser()); + return prefix + "/print"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java index f2829d1..721b3e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java @@ -72,8 +72,9 @@ public class TdQuestionController extends BaseController * 新增题库管理 */ @GetMapping("/add") - public String add() + public String add(ModelMap mmap) { + mmap.put("sysuser",getSysUser()); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java index bdf0413..4924566 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java @@ -79,8 +79,9 @@ public class TdPropertyManagerController extends BaseController * 新增资产登记 */ @GetMapping("/add") - public String add() + public String add(ModelMap mmap) { + mmap.put("sysuser",getSysUser()); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java index 1e66a85..a7b3f86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java @@ -74,8 +74,9 @@ public class TdPropertyNetController extends BaseController * 新增涉密网络设备 */ @GetMapping("/add") - public String add() + public String add(ModelMap mmap) { + mmap.put("sysuser",getSysUser()); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java index 396ac35..0726032 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java @@ -72,8 +72,9 @@ public class TdIndentureController extends BaseController * 新增维修商 */ @GetMapping("/add") - public String add() + public String add(ModelMap mmap) { + mmap.put("sysuser", getSysUser()); return prefix + "/add"; } diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html index 94f3f0e..98dd9fc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html @@ -39,9 +39,6 @@
- - 修改 - 删除 diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/add.html b/ruoyi-admin/src/main/resources/templates/system/dept/add.html index ef15245..7edd853 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dept/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/dept/add.html @@ -16,6 +16,18 @@
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/edit.html b/ruoyi-admin/src/main/resources/templates/system/dept/edit.html index 3469b32..0ae071c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dept/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/dept/edit.html @@ -17,6 +17,18 @@
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/exam/index.html b/ruoyi-admin/src/main/resources/templates/system/exam/index.html index da2054c..342da3d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/exam/index.html +++ b/ruoyi-admin/src/main/resources/templates/system/exam/index.html @@ -41,21 +41,10 @@
- + - - - - - - - - - - - @@ -74,9 +63,10 @@

答题过程不能中断!不能作弊和抄袭,

考试时间为：45分钟，到考试结束时间没有交卷的，系统将强制交卷！

- -

+

+

您的相关信息:

您的相关信息:
人员编号: [[${user.loginName}]]
 性别:
选择相关考题
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html index 24fd831..a2c7d29 100644 --- a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html @@ -66,7 +66,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html index b7a2704..8b6f984 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html @@ -43,7 +43,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html index 25a294e..06156a6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html @@ -34,7 +34,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html index 9cd6052..ece3da0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html @@ -37,13 +37,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/question/add.html b/ruoyi-admin/src/main/resources/templates/system/question/add.html index 70e95b1..89d572d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/question/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/question/add.html @@ -54,7 +54,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/question/edit.html b/ruoyi-admin/src/main/resources/templates/system/question/edit.html index 5052353..600c253 100644 --- a/ruoyi-admin/src/main/resources/templates/system/question/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/question/edit.html @@ -55,7 +55,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html new file mode 100644 index 0000000..f7b5f03 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html @@ -0,0 +1,11 @@ + + + + + Title + + + +

用户数量统计

+ + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html index 3946dc0..b15156c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html @@ -16,19 +16,16 @@
  • - 人员名称： + +
  • - 用户状态： + +
    • -
  • - - - - - +
  • + +
  •  搜索 @@ -43,9 +40,6 @@ 导出 - - 打印 -
@@ -59,6 +53,9 @@ - - \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index c62783f..0d636bb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -4,6 +4,8 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.TableField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -30,6 +32,28 @@ public class SysDept extends BaseEntity /** 部门名称 */ private String deptName; + /** 所属市州 */ + private String framework; + + /** 所属区县 */ + private String area; + + public String getFramework() { + return framework; + } + + public void setFramework(String framework) { + this.framework = framework; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + /** 显示顺序 */ private Integer orderNum; @@ -188,6 +212,8 @@ public class SysDept extends BaseEntity .append("parentId", getParentId()) .append("ancestors", getAncestors()) .append("deptName", getDeptName()) + .append("framework", getFramework()) + .append("area", getArea()) .append("orderNum", getOrderNum()) .append("leader", getLeader()) .append("phone", getPhone()) 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 57672e3..70d07b0 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 @@ -5,7 +5,6 @@ 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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index bcbd85c..6290b5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; /** @@ -44,6 +45,8 @@ public interface SysUserMapper extends BaseMapper */ public SysUser selectUserByLoginName(String userName); + public List selectUserGroupBydept(SysUser user); + /** * 通过手机号码查询用户 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index b59fc2c..9b2ba9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.SysUserRole; @@ -45,6 +46,8 @@ public interface ISysUserService extends IService */ public SysUser selectUserByLoginName(String userName); + public List selectUserGroupBydept(SysUser user); + /** * 通过手机号码查询用户 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index c54c158..1a88c4b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.entity.SysDept; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -116,6 +117,12 @@ public class SysUserServiceImpl extends ServiceImpl imple return userMapper.selectUserByLoginName(userName); } + @Override + public List selectUserGroupBydept(SysUser user) { + return userMapper.selectUserGroupBydept(user); + } + + /** * 通过手机号码查询用户 * diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 8f880f1..d6bcf2d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + select d.dept_id, d.parent_id, d.ancestors, d.dept_name,d.framework,d.area, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time from sys_dept d @@ -72,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +