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 0e943369..bff231a2 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 @@ -127,7 +127,7 @@ public class SysUsernumController extends BaseController { } - private List sharType = Arrays.asList("已登记", "已申报", "已审核", "已离职"); + private List sharType = Arrays.asList("已登记", "已申报", "已审核", "已离职","已离岗"); private List smType = Arrays.asList("一般涉密人员", "重要涉密人员", "核心涉密人员"); @@ -173,8 +173,10 @@ public class SysUsernumController extends BaseController { value.set(userCountDTO.getYsb()); }else if("已审核".equals(name)){ value.set(userCountDTO.getYsh()); - }else{ + }else if("已离职".equals(name)){ value.set(userCountDTO.getYlz()); + }else{ + value.set(userCountDTO.getYlg()); } JSONObject jsonObject = new JSONObject(); jsonObject.put("value", value.get()); 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 c3fd8ce0..fb660a47 100644 --- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html @@ -262,7 +262,7 @@ legend: { orient: 'vertical', x: 'right', - data: ['已登记', '已申报', '已审核', '已离职'] + data: ['已登记', '已申报', '已审核', '已离职', '已离岗'] }, series: [ { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/UserCountDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/UserCountDTO.java index 1d78184f..2a4f4185 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/UserCountDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/UserCountDTO.java @@ -30,4 +30,7 @@ public class UserCountDTO implements Serializable { @ApiModelProperty(value = "已离职") private Integer ylz; + + @ApiModelProperty(value = "已离岗") + private Integer ylg; } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 5e9ae2f5..8d3ce6c2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -321,7 +321,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM (CASE WHEN examine = 3 THEN 1 ELSE 0 END) AS ysb, SUM (CASE WHEN examine = 0 THEN 1 ELSE 0 END) AS ysh, (SELECT SUM (CASE WHEN leavestate = 1 THEN 1 ELSE 0 END) - FROM td_leave t) as ylz + FROM td_leave t) as ylz, + (SELECT SUM (CASE WHEN leavestate = 2 THEN 1 ELSE 0 END) + FROM td_leave t) as ylg FROM ${prefix}sys_user s