From 9e968e5f0d094d701c5bc8c620450a70d352bd6b Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Wed, 4 Dec 2024 16:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lSun <15893999301@qq.com> --- .../com/bonus/system/api/domain/SysUser.java | 26 ++++++++++++++++++- .../basic/controller/SysUserController.java | 25 ++++++++++++++++++ .../bonus/system/basic/dao/SysUserMapper.java | 10 +++++++ .../system/basic/service/SysUserService.java | 10 +++++++ .../service/impl/SysUserServiceImpl.java | 17 ++++++++++++ .../resources/mapper/basic/SysUserMapper.xml | 16 +++++++++++- .../mapper/evection/EvectionMapper.xml | 16 ++++++------ 7 files changed, 110 insertions(+), 10 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index a3a027b..524e6e9 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -134,8 +134,32 @@ public class SysUser extends BaseEntity { private String isPd; /** - * 是否项目部 + * 是否授予更新人脸权限 */ private String isFace; + /** + * 应用人脸 + */ + private String appliedFace; + + /** + * 修改人脸 + */ + private String newFace; + + /** + * 0 待审核 1 已审核 2 不通过 + */ + private String isCheck; + + /** + * 审批意见 + */ + private String examineOpinion; + + /** + * 采集时间 + */ + private String collectionTime; } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index 43f52a5..1ec9908 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -12,6 +12,7 @@ import com.bonus.system.api.domain.MapVo; import com.bonus.system.api.domain.SysUser; import com.bonus.system.basic.service.SysMenuService; import com.bonus.system.basic.service.SysUserService; +import com.bonus.system.dept.entity.ProDeptRoleDo; import org.apache.commons.lang3.StringUtils; import org.apache.poi.util.IOUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -90,6 +91,16 @@ public class SysUserController extends BaseController { return userService.updatePwd(user); } + + /** + * 授予更新人脸权 + */ + @Log(title = "系统管理->人员信息->授予更新人脸权", businessType = BusinessType.UPDATE) + @PostMapping("/updateIsFace") + public AjaxResult updateIsFace(@Validated @RequestBody SysUser user){ + return userService.updateIsFace(user); + } + /** * 修改用户 */ @@ -240,6 +251,20 @@ public class SysUserController extends BaseController { return userService.getSelectUserCurrent(); } + /** + * 审批项目部角色配置 + */ + @PostMapping("checkPersonAssignment") + @Log(title = "项目部管理->项目部角色管理->项目部角色审批", businessType = BusinessType.UPDATE) + public AjaxResult checkPersonAssignment(@RequestBody SysUser bean) { + try{ + return toAjax(userService.checkPersonAssignment(bean)); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return error("系统异常"); + } + /** * 用户模板-下载模板 * @param request diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java index 7c04c82..634c9cb 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java @@ -211,4 +211,14 @@ public interface SysUserMapper * @return */ SysUser checkUserNameUnique(String userName); + List getAttGroupByUserId(SysUser user); + + /** + * 授予更新人脸权 + * @param user + * @return + */ + int updateIsFace(SysUser user); + + int checkPersonAssignment(SysUser bean); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java index 3c4fdbf..4f8dbdb 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java @@ -130,4 +130,14 @@ public interface SysUserService { * @return */ boolean checkUserNameUnique(SysUser user); +// List getAttGroupByUserId(SysUser user); + + /** + * 授予更新人脸权 + * @param user + * @return + */ + AjaxResult updateIsFace(SysUser user); + + int checkPersonAssignment(SysUser bean); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java index 5dfe67b..dd5f53f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java @@ -203,6 +203,23 @@ public class SysUserServiceImpl implements SysUserService } } + @Override + public AjaxResult updateIsFace(SysUser user) { + int result = userMapper.updateIsFace(user); + if (result == 0) { + return AjaxResult.error("修改失败"); + }else if (result == 1) { + return AjaxResult.success(); + }else { + return AjaxResult.error("修改失败"); + } + } + + @Override + public int checkPersonAssignment(SysUser bean) { + return userMapper.checkPersonAssignment(bean); + } + @Override @Transactional(rollbackFor = Exception.class) public int deleteUserByIds(Long userId) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml index 6d03565..8465229 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml @@ -69,6 +69,14 @@ where user_id = #{userId} + + update sys_user set is_face = #{isFace} where user_id = #{userId} + + + + UPDATE sys_user_face SET `is_check` = #{isCheck}, `examine_opinion` = #{examineOpinion} WHERE `user_id` = #{userId} + + @@ -87,7 +87,7 @@ l.leave_end_interval, l.leave_duration, GROUP_CONCAT(d.dict_label SEPARATOR ', ') AS postName, - l.leave_form_id as uuId, + l.leave_form_id as uuid, l.submit_id, l.update_time FROM @@ -128,7 +128,7 @@ ORDER BY l.update_time DESC ) a LEFT JOIN sys_user su ON su.user_id = a.submit_id - GROUP BY uuId + GROUP BY uuid ORDER BY leave_start_date DESC @@ -154,7 +154,7 @@ l.leave_end_interval, l.leave_duration, GROUP_CONCAT(d.dict_label SEPARATOR ', ') AS postName, - l.leave_form_id as uuId, + l.leave_form_id as uuid, l.submit_id, l.host_user_id, l.is_agree, @@ -165,7 +165,7 @@ LEFT JOIN sys_dict_data d on d.dict_code = p.post_id WHERE l.is_active = '1' AND l.leave_type = '出差报备' - and l.leave_form_id = #{uuId} + and l.leave_form_id = #{uuid} GROUP BY l.id, l.user_id, l.user_name, @@ -187,7 +187,7 @@ l.remark ORDER BY l.update_time DESC) a LEFT JOIN sys_user su ON su.user_id = a.submit_id - GROUP BY uuId + GROUP BY uuid