feat:人员统计修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java

@@ -130,7 +130,7 @@ public class SysUsernumController extends BaseController {
     }
 
 
-    private List<String> sharType = Arrays.asList("已登记", "已申报", "已审核", "已离职","已离岗");
+    private List<String> sharType = Arrays.asList("已登记", "已审查", "已定岗", "已离职","已离岗");
 
 
     private List<String> smType = Arrays.asList("一般涉密人员", "重要涉密人员", "核心涉密人员");
@@ -172,10 +172,10 @@ public class SysUsernumController extends BaseController {
                     AtomicReference<Object> value = new AtomicReference<>(0L);
                     if("已登记".equals(name)){
                         value.set(userCountDTO.getYdj());
-                    }else if("已申报".equals(name)){
+                    }else if("已审查".equals(name)){
-                        value.set(userCountDTO.getYsb());
+                        value.set(userCountDTO.getYsc());
-                    }else if("已审核".equals(name)){
+                    }else if("已定岗".equals(name)){
-                        value.set(userCountDTO.getYsh());
+                        value.set(userCountDTO.getYdg());
                     }else if("已离职".equals(name)){
                         value.set(userCountDTO.getYlz());
                     }else{

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%']
 						}
 					]
 				});

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 = "已申报")
+    @ApiModelProperty(value = "已审查")
-    private  Integer ysb;
+    private  Integer ysc;
 
-    @ApiModelProperty(value = "已审核")
+    @ApiModelProperty(value = "已定岗")
-    private  Integer ysh;
+    private  Integer ydg;
 
     @ApiModelProperty(value = "已离职")
     private  Integer ylz;

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -318,8 +318,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectCountUser"  resultType="com.ruoyi.system.domain.count.UserCountDTO">
 		SELECT
 			SUM (CASE WHEN examine = '2' THEN 1 ELSE 0 END) AS ydj,
-			SUM (CASE WHEN examine = '3' THEN 1 ELSE 0 END) AS ysb,
+			SUM (CASE WHEN examine = '3' THEN 1 ELSE 0 END) AS ydg,
-			SUM (CASE WHEN examine = '0' THEN 1 ELSE 0 END) AS ysh,
+			SUM (CASE WHEN examine = '0' THEN 1 ELSE 0 END) AS ysc,
 			(SELECT SUM (CASE WHEN leavestate = '1' THEN 1 ELSE 0 END)
 			 FROM td_leave t) as ylz,
 			(SELECT SUM (CASE WHEN leavestate = '2' THEN 1 ELSE 0 END)