From 4ffb639d33e4304bafb23784ac6c34c123171182 Mon Sep 17 00:00:00 2001 From: zt Date: Wed, 17 Sep 2025 17:44:28 +0800 Subject: [PATCH] bug --- .../SubConstructionUserController.java | 2 +- .../SubConstructionUserVo.java | 2 + .../impl/SubConstructionUserServiceImpl.java | 43 ++++++++++++++++--- .../impl/BusAttendanceServiceImpl.java | 2 +- .../impl/BusProjectTeamMemberServiceImpl.java | 40 ++++++++--------- .../QltQualityInspectionController.java | 10 +++++ .../QltQualityInspectionQueryReq.java | 3 +- .../impl/QltQualityInspectionServiceImpl.java | 5 ++- .../HseSafetyInspectionController.java | 9 ++++ .../controller/system/SysUserController.java | 8 ++++ .../org/dromara/system/domain/SysUser.java | 6 +++ .../dromara/system/domain/vo/SysUserVo.java | 3 ++ .../system/service/ISysUserService.java | 4 ++ .../service/impl/SysUserServiceImpl.java | 14 ++++++ 14 files changed, 117 insertions(+), 34 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index 6a2d9adb..05e5c3f5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -255,7 +255,7 @@ public class SubConstructionUserController extends BaseController { /** * 人脸识别 */ - @SaCheckPermission("contractor:constructionUser:add") +// @SaCheckPermission("contractor:constructionUser:add") @Log(title = "施工人员", businessType = BusinessType.OTHER) @PostMapping("/face/recognize") public R faceRecognize(@RequestParam("file") MultipartFile file) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java index 5cf21ba6..b57de4fe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java @@ -294,4 +294,6 @@ public class SubConstructionUserVo implements Serializable { * 用户Id */ private Long sysUserId; + + private String postId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java index 5182be8a..9934619c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.contractor.service.impl; +import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.IoUtil; @@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.dromara.common.core.constant.DateConstant; import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.enums.UserType; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.ObjectUtils; @@ -52,6 +54,7 @@ import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum; import org.dromara.project.service.*; +import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysUserVo; @@ -332,6 +335,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpllambdaQuery() + .eq(BusProjectTeamMember::getTeamId, constructionUser.getTeamId()) + .last("limit 1") + ); + if(one != null){ + constructionUserVo.setPostId(one.getPostId()); + } + + } return constructionUserVo; }).toList(); constructionUserVoPage.setRecords(constructionUserVoList); + return constructionUserVoPage; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index 54ec44cd..4303a506 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -470,7 +470,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl matchingRange = JSTUtil.findMatchingRange(req.getLat(), req.getLng(), punchRangeList); return matchingRange != null; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java index afc894d3..3bbe1581 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java @@ -140,10 +140,13 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl sysUserRoles = userRoleMapper.selectList(Wrappers.lambdaQuery() + //设置基础角色 先清空已有角色 + userRoleMapper.delete(Wrappers.lambdaQuery() .eq(SysUserRole::getUserId, constructionUser.getSysUserId()) .eq(SysUserRole::getProjectId, req.getProjectId()) .in(SysUserRole::getRoleId, Arrays.asList(2L, 3L)) ); - if (CollUtil.isEmpty(sysUserRoles)) { - SysUserRole sysUserRole = new SysUserRole(); - sysUserRole.setUserId(constructionUser.getSysUserId()); - sysUserRole.setRoleId("0".equals(req.getPostId()) ? 2L : 3L); - sysUserRole.setProjectId(req.getProjectId()); - userRoleMapper.insert(sysUserRole); - } else { - Long roleId = "0".equals(req.getPostId()) ? 2L : 3L; - List list1 = sysUserRoles.stream().map(SysUserRole::getRoleId).toList(); - if (!list1.contains(roleId)){ - SysUserRole sysUserRole = new SysUserRole(); - sysUserRole.setUserId(constructionUser.getSysUserId()); - sysUserRole.setRoleId(roleId); - sysUserRole.setProjectId(req.getProjectId()); - userRoleMapper.insert(sysUserRole); - } - } + //再添加分配角色 + Long roleId = "0".equals(req.getPostId()) ? 2L : 3L; + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setUserId(constructionUser.getSysUserId()); + sysUserRole.setRoleId(roleId); + sysUserRole.setProjectId(req.getProjectId()); + userRoleMapper.insert(sysUserRole); + return projectTeamMember.getId(); } @@ -290,11 +284,11 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl> getRecord(@NotNull(message = "任务批号不能为空") + @PathVariable String jobKey) { + return R.ok(qualityInspectionService.getRecord(jobKey)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java index bb5a2161..46b39d60 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * @author lilemy @@ -52,6 +53,4 @@ public class QltQualityInspectionQueryReq implements Serializable { * 巡检标题 */ private String inspectionHeadline; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index 4079a203..8a947628 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -347,12 +347,15 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl> getRecord(@NotNull(message = "任务批号不能为空") + @PathVariable String jobKey) { + return R.ok(safetyInspectionService.getRecord(jobKey)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 2317252a..729e06be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -326,4 +326,12 @@ public class SysUserController extends BaseController { return R.ok(userService.selectUserListByDept(deptId)); } + @SaCheckPermission("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/appUserType/{userId}/{appUserType}") + public R updateUserAppType(@PathVariable("userId") Long userId, + @PathVariable("appUserType") String appUserType) { + return R.ok(userService.updateAppUserType(userId, appUserType)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java index 3712f805..996d35a1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -104,6 +104,12 @@ public class SysUser extends TenantEntity { private String remark; + /** + * app用户类型 0-施工人员 1-管理人员 2-分包人员 + */ + private String appUserType; + + public SysUser(Long userId) { this.userId = userId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 739f73aa..db5a6e5b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -149,4 +149,7 @@ public class SysUserVo implements Serializable { */ private List projectIds; + + private String appUserType; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 29d5e2d7..7458a81c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -260,4 +260,8 @@ public interface ISysUserService { List getUserNamesByDept(Long deptId); SysUserVo queryById(Long userId); + + Long save(SysUser sysUser); + + Boolean updateAppUserType(Long userId,String appUserType); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 493182f0..ea91f9dd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -815,6 +815,20 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return ObjectUtils.notNullGetter(sysUser, SysUser::getUserName); } + @Override + public Long save(SysUser sysUser) { + baseMapper.insert(sysUser); + return sysUser.getUserId(); + } + + @Override + public Boolean updateAppUserType(Long userId, String appUserType) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysUser::getAppUserType, appUserType) + .eq(SysUser::getUserId, userId)) > 0; + } + /** * 通过用户ID查询用户账户 *