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 f553447..0edd872 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 @@ -130,7 +130,7 @@ public class SysUsernumController extends BaseController { } - private List sharType = Arrays.asList("已登记", "已申报", "已审核", "已离职","已离岗"); + private List sharType = Arrays.asList("已登记", "已审查", "已定岗", "已离职","已离岗"); private List smType = Arrays.asList("一般涉密人员", "重要涉密人员", "核心涉密人员"); @@ -172,10 +172,10 @@ public class SysUsernumController extends BaseController { AtomicReference value = new AtomicReference<>(0L); if("已登记".equals(name)){ value.set(userCountDTO.getYdj()); - }else if("已申报".equals(name)){ - value.set(userCountDTO.getYsb()); - }else if("已审核".equals(name)){ - value.set(userCountDTO.getYsh()); + }else if("已审查".equals(name)){ + value.set(userCountDTO.getYsc()); + }else if("已定岗".equals(name)){ + value.set(userCountDTO.getYdg()); }else if("已离职".equals(name)){ value.set(userCountDTO.getYlz()); }else{ 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 39f46bc..5a60854 100644 --- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html +++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html @@ -300,7 +300,7 @@ legend: { orient: 'vertical', x: 'right', - data: ['已登记', '已申报', '已审核', '已离职', '已离岗'], + data: ['已登记', '已审查', '已定岗', '已离职', '已离岗'], top: '60%', left: '81%' }, @@ -308,7 +308,7 @@ { type: 'pie', data: response.data.data, - center: ['40%', '55%'] + center: ['43%', '55%'] } ] }); 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 2a4f418..9f7ab0b 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 @@ -22,11 +22,11 @@ public class UserCountDTO implements Serializable { @ApiModelProperty(value = "已登记") private Integer ydj; - @ApiModelProperty(value = "已申报") - private Integer ysb; + @ApiModelProperty(value = "已审查") + private Integer ysc; - @ApiModelProperty(value = "已审核") - private Integer ysh; + @ApiModelProperty(value = "已定岗") + private Integer ydg; @ApiModelProperty(value = "已离职") private Integer ylz; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 762a219..d22979e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -318,8 +318,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"