From 9c672cd0f2f139e838ab9ec2ef2b08246cce17ef Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Apr 2022 10:43:00 +0800
Subject: [PATCH] 地址替换
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 557326a..7b0a167 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -54,9 +54,11 @@
import org.springblade.modules.system.excel.UserImporters;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserRegisterStatisVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.vo.UsersVo;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springblade.modules.taskqd.vo.TaskqdVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -544,13 +546,12 @@
if (userCount > 0) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- user.setRoleId("1372092102682521602");
+ user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
user.setStype("1");
user.setId(null);
//用户新增
boolean status = userService.save(user);
-// System.out.println("user = " + user);
//返回
return R.status(status);
}
@@ -631,5 +632,25 @@
return R.status(status);
}
+ /**
+ * 人员统计
+ */
+ @GetMapping("/userCount")
+ public R cancelTask(String xid,String index) {
+ List<UserRegisterStatisVO> cout = userService.getUserTypeCountXq(xid);
+ List<UserVO> list = userService.getUserTypeList(xid,index);
+ Map<String,Object> res = new HashMap<>();
+ res.put("cout",cout);
+ res.put("list",list);
+ return R.data(res);
+ }
+
+ /**
+ * 首次登录发送祝贺信
+ */
+ @GetMapping("/firstLogin")
+ public R firstLogin(String id) {
+ return R.status(userService.firstLogin(id));
+ }
}
--
Gitblit v1.9.3