From 8f2ac2271eff37383ee21b659de6d30fb884cbd4 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Wed, 4 Jun 2025 10:22:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/SysUsernumController.java | 13 ++++--- .../templates/system/usernum/usernum.html | 2 +- .../domain/apply/dto/ApplyCountDTO.java | 34 +++++++++++++++++++ .../mapper/apply/TdApplyInfoListMapper.java | 5 +++ .../service/apply/TdApplyInfoListService.java | 6 ++++ .../impl/TdApplyInfoListServiceImpl.java | 6 ++++ .../system/apply/TdApplyInfoListMapper.xml | 10 ++++++ 7 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplyCountDTO.java 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 1b056f28..64b4a974 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 @@ -22,6 +22,7 @@ import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplyCountDTO; import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.count.UserCountDTO; @@ -137,7 +138,7 @@ public class SysUsernumController extends BaseController { } - private List sharType = Arrays.asList("已登记", "已审查", "已定岗", "已离职","已离岗"); + private List sharType = Arrays.asList("已登记", "已上岗", "已调岗","已离职"); private List smType = Arrays.asList("一般涉密人员", "重要涉密人员", "核心涉密人员"); @@ -173,20 +174,18 @@ public class SysUsernumController extends BaseController { @PostMapping("/countUser") @ResponseBody public AjaxResult countUser() { - UserCountDTO userCountDTO = userService.selectCountUser(); + ApplyCountDTO userCountDTO = applyInfoListService.selectCountApply(); List datas = sharType.stream() .map(name -> { AtomicReference value = new AtomicReference<>(0L); if("已登记".equals(name)){ value.set(userCountDTO.getYdj()); - }else if("已审查".equals(name)){ - value.set(userCountDTO.getYsc()); - }else if("已定岗".equals(name)){ - value.set(userCountDTO.getYdg()); + }else if("已上岗".equals(name)){ + value.set(userCountDTO.getYsg()); }else if("已离职".equals(name)){ value.set(userCountDTO.getYlz()); }else{ - value.set(userCountDTO.getYlg()); + value.set(userCountDTO.getYtg()); } 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 cac32f68..e9d05a5f 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%' }, diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplyCountDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplyCountDTO.java new file mode 100644 index 00000000..f7f4ffcc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplyCountDTO.java @@ -0,0 +1,34 @@ +package com.ruoyi.system.domain.apply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * packageName com.ruoyi.system.domain.userexam.dto.response + * + * @author wangxy + * @version JDK 8 + * @className ExamCountDTO + * @date 2024/8/7 + * @description 用户统计 + */ +@Data +@ApiModel(value="用户统计", description="用户统计") +public class ApplyCountDTO implements Serializable { + + @ApiModelProperty(value = "已登记") + private Integer ydj; + + @ApiModelProperty(value = "已上岗") + private Integer ysg; + + @ApiModelProperty(value = "已调岗") + private Integer ytg; + + @ApiModelProperty(value = "已离职") + private Integer ylz; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java index 2e765d4a..5d48c0e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper.apply; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplyCountDTO; import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; @@ -47,6 +48,10 @@ public interface TdApplyInfoListMapper extends BaseMapper { + public ApplyCountDTO selectCountApply(); + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java index 2d285f9a..47b3ce37 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.apply; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplyCountDTO; import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; import com.ruoyi.system.domain.count.UserSmCountDTO; @@ -49,6 +50,11 @@ public interface TdApplyInfoListService extends IService { + public ApplyCountDTO selectCountApply(); + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java index c7432f44..9d924aa1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service.apply.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplyCountDTO; import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; import com.ruoyi.system.mapper.apply.TdApplyInfoListMapper; @@ -84,6 +85,11 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl + + +