From cc175f25cbd953fc2c3623495c1f4b8e0efec4ee Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 25 二月 2025 17:12:16 +0800
Subject: [PATCH] 2.0新增
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
index 73c9f25..23c31c9 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.IInviteService;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
@@ -52,6 +53,11 @@
public String index() {
return PREFIX + "tUser.html";
}
+ @RequestMapping("/invite/{id}")
+ public String inviteList(@PathVariable("id")Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "tUser_invite.html";
+ }
/**
* 跳转到修改用户管理
@@ -91,6 +97,8 @@
return PREFIX + "tUser_optUser.html";
}
+ @Autowired
+ private IInviteService inviteService;
/**
* 获取用户管理列表
*/
@@ -110,7 +118,40 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tUserService.getUserList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),isAuth,state,id,nickName,phone,companyName));
+ List<Map<String, Object>> userList = tUserService.getUserList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), isAuth, state, id, nickName, phone, companyName);
+ for (Map<String, Object> stringObjectMap : userList) {
+ String string = stringObjectMap.get("id").toString();
+ int i = inviteService.selectCount(new EntityWrapper<Invite>()
+ .eq("inviteUserId", string)
+ .eq("userType",1)
+ );
+ stringObjectMap.put("inviteNumber", i);
+ }
+ page.setRecords(userList);
+ return super.packForBT(page);
+ }
+ /**
+ * 获取用户管理列表-邀请列表
+ */
+ @RequestMapping(value = "/inviteList")
+ @ResponseBody
+ public Object list(Integer uid,String userName,String time) {
+ if (uid==null)return null;
+ String startTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(time)){
+ String[] timeArray = time.split(" - ");
+ startTime = timeArray[0]+" 00:00:00";
+ endTime = timeArray[1]+" 23:59:59";
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ List<Map<String, Object>> userList = tUserService.inviteList(page, startTime,endTime,userName,uid);
+ for (Map<String, Object> stringObjectMap : userList) {
+ String string = stringObjectMap.get("inviteUserId").toString();
+ TUser tUser = tUserService.selectById(string);
+ stringObjectMap.put("inviteUserName",tUser.getNickName());
+ }
+ page.setRecords(userList);
return super.packForBT(page);
}
--
Gitblit v1.7.1