feat:人员类型统计

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<String> sharType = Arrays.asList("已登记", "已审查", "已定岗", "已离职","已离岗");
+    private List<String> sharType = Arrays.asList("已登记", "已上岗", "已调岗","已离职");
 
 
     private List<String> 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<JSONObject> datas = sharType.stream()
                 .map(name -> {
                     AtomicReference<Object> value = new AtomicReference<>(0L);
                     if("已登记".equals(name)){
                         value.set(userCountDTO.getYdj());
-                    }else if("已审查".equals(name)){
+                    }else if("已上岗".equals(name)){
-                        value.set(userCountDTO.getYsc());
+                        value.set(userCountDTO.getYsg());
-                    }else if("已定岗".equals(name)){
-                        value.set(userCountDTO.getYdg());
                     }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());

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%'
 				},

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;
+
+}

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<TdApplyInfoList> {
 
 
 
+    public ApplyCountDTO selectCountApply();
+
+
+
 
 
 

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<TdApplyInfoList> {
 
 
 
+    public ApplyCountDTO selectCountApply();
+
+
+
+
 
 
 

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<TdApplyInfoListMappe
     public ApplySmCountDTO selectCountSmApply() {
         return applyInfoListMapper.selectCountSmApply();
     }
+
+    @Override
+    public ApplyCountDTO selectCountApply() {
+        return applyInfoListMapper.selectCountApply();
+    }
 }
 
 

ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml

@@ -338,4 +338,14 @@
     </select>
 
 
+    <select id="selectCountApply"  resultType="com.ruoyi.system.domain.apply.dto.ApplyCountDTO">
+        SELECT
+            SUM (CASE WHEN apply_status = '0' THEN 1 ELSE 0 END) AS ydj,
+            SUM (CASE WHEN apply_status = '5' THEN 1 ELSE 0 END) AS ysg,
+            SUM (CASE WHEN remark = '1' and apply_status = '5' THEN 1 ELSE 0 END) AS ytg,
+             SUM (CASE WHEN apply_status = '7' THEN 1 ELSE 0 END) as ylz
+        FROM  td_apply_info_list
+    </select>
+
+
 </mapper>