diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/HomeController.java b/src/main/java/com/bonus/aqgqj/basis/controller/HomeController.java index dfcf4cf..423ccaa 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/HomeController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/HomeController.java @@ -98,6 +98,7 @@ public class HomeController { @PostMapping(value = "getExpireDataList") @DecryptAndVerify(decryptedClass = SamplesManageDto.class) @LogAnnotation(operModul = "系统管理-首页", operation = "获取临期数据列表", operDesc = "业务级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:alter:all')") public ServerResponse getExpireDataList(EncryptedReq data) { PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { diff --git a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java index 3631965..263d99d 100644 --- a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java @@ -350,6 +350,21 @@ public class UserController { return ServerResponse.createErroe("操作失败"); } + @PostMapping(value = "getPersonList") + @DecryptAndVerify(decryptedClass = SysUser.class) + @LogAnnotation(operModul = "系统管理-个人信息管理", operation = "查询个人信息列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getPersonList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); + try { + List list = userService.getPersonList(data.getData()); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); + } + /** * 上传用户签字图片 diff --git a/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java index 9df3434..f25e5b2 100644 --- a/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java @@ -190,4 +190,11 @@ public interface UserDao { * @return */ int delSignById(Long id); + + /** + * 查询人员列表 + * @param data + * @return + */ + List getPersonList(SysUser data); } diff --git a/src/main/java/com/bonus/aqgqj/system/service/UserService.java b/src/main/java/com/bonus/aqgqj/system/service/UserService.java index 9ac66b9..55e8882 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/UserService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/UserService.java @@ -161,4 +161,11 @@ public interface UserService { * @return */ int delSignById(Long id); + + /** + * 查询个人信息 + * @param data + * @return + */ + List getPersonList(SysUser data); } diff --git a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java index 8aaf113..44907e0 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java @@ -251,6 +251,24 @@ public class UserServiceImpl implements UserService { return userDao.delSignById(id); } + @Override + public List getPersonList(SysUser data) { + //获取登录人id + Long userId = UserUtil.getLoginUser().getId(); + data.setId(userId); + List list = userDao.getPersonList(data); + if (list.size() > 0) { + for (SysUser users : list) { + if (StringHelper.isNotEmpty(users.getSignImg())) { + users.setSignStatus("已签"); + } else { + users.setSignStatus("未签"); + } + } + } + return list; + } + /** * 修改用户 */ diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index a22e291..bec930d 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -240,6 +240,41 @@ and p_id=192 and del_flag=0 + insert into sys_role_user(roleId, userId) values diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js index 29c1dda..d79e1d9 100644 --- a/src/main/resources/static/js/main.js +++ b/src/main/resources/static/js/main.js @@ -21,15 +21,19 @@ function setExpireData(data){ console.log(data) console.log(data.length) if (data.length>0){ - layer.open({ - type: 2, // 表示iframe层 - title: '临期数据', - content: 'pages/expireDataList.html?l=' + localStorage.getItem("lang") + '&token=' + localStorage.getItem("token"), - area: ['800px', '600px'], // 宽高 - success: function(layero, index){ - // 可以在这里做一些操作,比如监听iframe内部的事件 - } - }); + + openIframe2("expireDataList", '临期数据', "pages/expireDataList.html", '800px', '600px',''); + + + // layer.open({ + // type: 2, // 表示iframe层 + // title: '临期数据', + // content: 'pages/expireDataList.html?l=' + localStorage.getItem("lang") + '&token=' + localStorage.getItem("token"), + // area: ['800px', '600px'], // 宽高 + // success: function(layero, index){ + // // 可以在这里做一些操作,比如监听iframe内部的事件 + // } + // }); } } function initMenu(){