lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
zt
2025-10-10 21:03:10 +08:00
parent 22a7500048
commit 6c96c6f534
28 changed files with 420 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
View File

@ -142,7 +142,9 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
ProjectPeopleVo vo = new ProjectPeopleVo();
// 获取施工人员总数
Long count = constructionUserService.lambdaQuery()
.eq(SubConstructionUser::getProjectId, projectId).count();
.eq(SubConstructionUser::getProjectId, projectId)
.isNotNull(SubConstructionUser::getTeamId)
.count();
BigDecimal countDec = BigDecimal.valueOf(count);
vo.setPeopleCount(countDec);
// 获取考勤数据

82
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
View File

@ -76,6 +76,8 @@ import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
import static org.dromara.project.domain.enums.BusAttendanceClockStatusEnum.ATTENDANCE_LIST;
/**
* 施工人员Service业务层处理
*
@ -180,7 +182,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
if ("2".equals(appUserType)) {
List<BusProjectTeamAppVo> byUserId = projectTeamService.getByUserId(userId, req.getProjectId());
if(CollectionUtil.isEmpty(byUserId)){
if (CollectionUtil.isEmpty(byUserId)) {
return new TableDataInfo<>();
}
list1 = byUserId.stream().map(BusProjectTeamAppVo::getId).toList();
@ -188,7 +190,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
// 查询数据库
LambdaQueryWrapper<SubConstructionUser> wrapper = this.buildQueryWrapper(req);
wrapper.in(req.getTeamId() == null && "2".equals(appUserType), SubConstructionUser::getTeamId,list1);
wrapper.in(req.getTeamId() == null && "2".equals(appUserType), SubConstructionUser::getTeamId, list1);
wrapper.eq(SubConstructionUser::getUserRole, "0");
Page<SubConstructionUser> result = this.page(pageQuery.build(), wrapper);
return TableDataInfo.build(getVoPage(result));
@ -230,14 +232,14 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
@Transactional(rollbackFor = Exception.class)
public Boolean allocate(AllocateDto dto) {
SubConstructionUser constructionUser = baseMapper.selectById(dto.getId());
if(constructionUser == null){
if (constructionUser == null) {
throw new ServiceException("施工人员信息不存在", HttpStatus.ERROR);
}
constructionUser.setProjectId(dto.getProjectId());
constructionUser.setContractorId(dto.getContractorId());
BusProjectTeam team = projectTeamService.getById(dto.getTeamId());
if(team == null){
if (team == null) {
throw new ServiceException("班组信息不存在", HttpStatus.ERROR);
}
constructionUser.setTeamId(dto.getTeamId());
@ -287,7 +289,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
//强退
roleService.cleanOnlineUser(Collections.singletonList(constructionUser.getSysUserId()));
return i>0;
return i > 0;
}
/**
@ -853,7 +855,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
String decrypt = constructionUserVo.getSfzNumber();
try {
decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
}catch (Exception e) {
} catch (Exception e) {
log.error("身份证号码解密失败", e);
}
constructionUserVo.setSfzNumber(decrypt);
@ -1064,7 +1066,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
constructionUserVo.setPostId(one.getPostId());
}
}else {
} else {
constructionUserVo.setTeamName(null);
}
@ -1084,18 +1086,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
@Override
public Page<SubConstructionUserAttendanceTotalVo> getAttendanceTotalVoPage(SubConstructionUserAttendanceQueryReq req,
PageQuery pageQuery) {
LambdaQueryWrapper<SubConstructionUser> lqw = Wrappers.lambdaQuery();
// 从对象中取值
String userName = req.getUserName();
Long projectId = req.getProjectId();
Long teamId = req.getTeamId();
String typeOfWork = req.getTypeOfWork();
String clockMonth = req.getClockDate();
// 联表查询
LambdaQueryWrapper<BusAttendance> attendanceLqw = Wrappers.lambdaQuery(BusAttendance.class)
.eq(BusAttendance::getProjectId, projectId);
if (ObjectUtils.isNotEmpty(clockMonth)) {
// 校验月份格式
if (!DateConstant.YEAR_MONTH_PATTERN.matcher(clockMonth).matches()) {
throw new ServiceException("月份格式不正确", HttpStatus.BAD_REQUEST);
}
@ -1108,13 +1099,38 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
// 计算当月第一天 / 最后一天
LocalDate start = yearMonth.atDay(1);
LocalDate end = yearMonth.atEndOfMonth();
attendanceLqw.between(BusAttendance::getClockDate, start, end);
List<Long> userIdList = attendanceService.list(attendanceLqw)
.stream().map(BusAttendance::getUserId).toList();
if (CollUtil.isNotEmpty(userIdList)) {
lqw.in(SubConstructionUser::getSysUserId, userIdList);
}
}
LambdaQueryWrapper<SubConstructionUser> lqw = Wrappers.lambdaQuery();
// 从对象中取值
String userName = req.getUserName();
Long projectId = req.getProjectId();
Long teamId = req.getTeamId();
String typeOfWork = req.getTypeOfWork();
// 联表查询
LambdaQueryWrapper<BusAttendance> attendanceLqw = Wrappers.lambdaQuery(BusAttendance.class)
.eq(BusAttendance::getProjectId, projectId);
// if (ObjectUtils.isNotEmpty(clockMonth)) {
// // 校验月份格式
// if (!DateConstant.YEAR_MONTH_PATTERN.matcher(clockMonth).matches()) {
// throw new ServiceException("月份格式不正确", HttpStatus.BAD_REQUEST);
// }
// // 解析月份
// YearMonth yearMonth = YearMonth.parse(clockMonth);
// // 判断是否大于当前月份
// if (yearMonth.isAfter(YearMonth.now())) {
// throw new ServiceException("不能查看大于当前月份的记录", HttpStatus.BAD_REQUEST);
// }
// // 计算当月第一天 / 最后一天
// LocalDate start = yearMonth.atDay(1);
// LocalDate end = yearMonth.atEndOfMonth();
// attendanceLqw.between(BusAttendance::getClockDate, start, end);
// List<Long> userIdList = attendanceService.list(attendanceLqw)
// .stream().map(BusAttendance::getUserId).toList();
// if (CollUtil.isNotEmpty(userIdList)) {
// lqw.in(SubConstructionUser::getSysUserId, userIdList);
// }
// }
// 模糊查询
lqw.like(StringUtils.isNotBlank(userName), SubConstructionUser::getUserName, userName);
// 精确查询
@ -1129,6 +1145,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
}
//只查施工人员
lqw.eq(SubConstructionUser::getUserRole, "0");
lqw.isNotNull(SubConstructionUser::getTeamId);
// 分页查询获取数据
Page<SubConstructionUser> constructionUserPage = this.page(pageQuery.build(), lqw);
List<SubConstructionUser> constructionUserList = constructionUserPage.getRecords();
@ -1143,6 +1160,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
List<Long> userIdList = constructionUserList.stream().map(SubConstructionUser::getSysUserId).toList();
// 关联查询施工人员考勤列表
attendanceLqw.in(BusAttendance::getUserId, userIdList);
attendanceLqw.between(BusAttendance::getClockDate, start, end);
Map<Long, List<BusAttendance>> userIdBusAttendanceListMap = attendanceService.list(attendanceLqw)
.stream().collect(Collectors.groupingBy(BusAttendance::getUserId));
// 填充信息
@ -1194,8 +1212,12 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
unClockDays++;
}
}
if ((clockInStatus != null && ATTENDANCE_LIST.contains(clockInStatus))
|| (clockOutStatus != null && ATTENDANCE_LIST.contains(clockOutStatus))) {
attendanceDays++;
}
}
attendanceDays = dailyMap.size() - leaveDays;
}
}
constructionUserAttendanceTotalResp.setAttendanceDays(attendanceDays);
@ -1261,12 +1283,12 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
vo.setGender(wordsResult.getGender() != null ? wordsResult.getGender().getWords() : "");
vo.setImage(upload);
} else {
if (wordsResult.getExpiryDate() != null ) {
if (wordsResult.getExpiryDate() != null) {
vo.setExpiryDate(wordsResult.getExpiryDate().getWords());
if ("长期".equals(wordsResult.getExpiryDate().getWords())) {
vo.setExpiryDate("99991231");
}
}else {
} else {
vo.setExpiryDate("");
}
vo.setIssuingAuthority(wordsResult.getIssuingAuthority() != null ? wordsResult.getIssuingAuthority().getWords() : "");
@ -1488,9 +1510,9 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
lqw.eq(ObjectUtils.isNotEmpty(typeOfWork), SubConstructionUser::getTypeOfWork, typeOfWork);
lqw.isNull(SubConstructionUser::getTeamId);
if(req.getProjectId() == null){
if (req.getProjectId() == null) {
lqw.isNull(SubConstructionUser::getProjectId);
}else{
} else {
lqw.eq(SubConstructionUser::getProjectId, req.getProjectId());
}
Page<SubConstructionUser> result = this.page(pageQuery.build(), lqw);

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java
View File

@ -148,7 +148,8 @@ public class AttendanceJob {
busAttendance.setClockDate(date);
busAttendance.setClockType(BusAttendanceCommuterEnum.CLOCKIN.getValue());
busAttendance.setRuleTime(rule.getClockInTime());
if (leaveService.isLeave(date, sysUserId)) {
LocalDateTime localDateTime = date.atTime(clockInTime);
if (leaveService.isLeave(localDateTime, sysUserId)) {
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
} else {
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.UNCLOCK.getValue());
@ -268,7 +269,8 @@ public class AttendanceJob {
busAttendance.setClockDate(date);
busAttendance.setClockType(BusAttendanceCommuterEnum.CLOCKOUT.getValue());
busAttendance.setRuleTime(rule.getClockOutTime());
if (leaveService.isLeave(date, sysUserId)) {
LocalDateTime localDateTime = date.atTime(clockOutTime);
if (leaveService.isLeave(localDateTime, sysUserId)) {
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
} else {
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.UNCLOCK.getValue());

29
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java
View File

@ -7,7 +7,10 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.project.domain.dto.attendance.*;
import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq;
import org.dromara.project.domain.vo.attendance.*;
import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo;
import org.dromara.project.service.IBusProjectTeamService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -38,6 +41,8 @@ public class BusAttendanceController extends BaseController {
private final IBusAttendanceService busAttendanceService;
private final IBusProjectTeamService projectTeamService;
/**
* 查询考勤列表
*/
@ -114,10 +119,19 @@ public class BusAttendanceController extends BaseController {
return toAjax(busAttendanceService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 查询项目施工人员前14天考勤状况
*/
@GetMapping("/list/clockDate/twoWeek")
public R<List<BusAttendanceClockDateForTwoWeekVo>> getClockDateForTwoWeekList(Long projectId) {
return R.ok(busAttendanceService.getClockDateForTwoWeekList(projectId));
public R<List<BusAttendanceClockDateForTwoWeekVo>> getClockDateForTwoWeekList(TwoWeekDto dto) {
return R.ok(busAttendanceService.getClockDateForTwoWeekList(dto));
}
/**
* 查询项目施工人员当天考勤状况
*/
@GetMapping("/list/clockDate/today")
public R<BusAttendanceClockDateForTwoWeekVo> getTodayAttendanceData(TwoWeekDto dto) {
return R.ok(busAttendanceService.getTodayAttendanceData(dto));
}
@PostMapping("/exportList")
@ -125,4 +139,13 @@ public class BusAttendanceController extends BaseController {
busAttendanceService.getExportList(dto, response);
}
@GetMapping("/listByProject/{projectid}")
public R<List<BusProjectTeamVo>> listByProject(@NotNull(message = "项目id不能为空")
@PathVariable Long projectid) {
BusProjectTeamQueryReq busProjectTeamQueryReq = new BusProjectTeamQueryReq();
busProjectTeamQueryReq.setProjectId(projectid);
return R.ok(projectTeamService.queryList(busProjectTeamQueryReq));
}
}

17
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
View File

@ -14,6 +14,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq;
import org.dromara.contractor.domain.vo.contractor.SubContractorVo;
import org.dromara.contractor.service.ISubContractorService;
import org.dromara.project.domain.bo.BusProjectPunchrangeBo;
import org.dromara.project.domain.dto.projectteam.BusProjectTeamCreateReq;
import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq;
@ -48,6 +51,8 @@ public class BusProjectTeamController extends BaseController {
private final IBusProjectPunchrangeService busProjectPunchrangeService;
private final ISysUserService userService;
private final ISubContractorService contractorService;
/**
* 查询项目班组列表
*/
@ -138,8 +143,8 @@ public class BusProjectTeamController extends BaseController {
* 获取所有分包管理人员
*/
@GetMapping("/listSubContractor")
public R<List<SysUserVo>> listSubContractor(Long projectId) {
return R.ok(userService.selectUserListByAppUserType("2",projectId));
public R<List<SysUserVo>> listSubContractor(Long projectId,Long contractorId) {
return R.ok(userService.selectUserListByAppUserType("2",projectId,contractorId));
}
/**
@ -160,4 +165,12 @@ public class BusProjectTeamController extends BaseController {
return R.ok(busProjectTeamService.deleteUserId(id,userId));
}
/**
* 查询分包单位列表
*/
@GetMapping("/contractorList")
public R<List<SubContractorVo>> contractorList(SubContractorQueryReq req) {
return R.ok(contractorService.queryList(req));
}
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java
View File

@ -108,4 +108,9 @@ public class BusAttendance extends BaseEntity {
* 薪水
*/
private BigDecimal salary;
/**
* 代打卡人员Id
*/
private Long replaceId;
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusLeave.java
View File

@ -140,4 +140,13 @@ public class BusLeave extends BaseEntity {
*/
private String auditStatus;
/**
* 时间类型 1-天 2-小时
*/
private String timeType;
/**
* 时间段类型 1-上午 2-下午
*/
private String periodType;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java
View File

@ -57,4 +57,9 @@ public class BusProjectTeam extends BaseEntity {
* 管理员Id
*/
private String userId;
/**
* 分包公司Id
*/
private Long contractorId;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java
View File

@ -36,4 +36,9 @@ public class BusAttendancePunchCardByFaceReq implements Serializable {
*/
private Long projectId;
/**
* 用户Id
*/
private Long userId;
}

27
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/TwoWeekDto.java Normal file
View File

@ -0,0 +1,27 @@
package org.dromara.project.domain.dto.attendance;
import lombok.Data;
@Data
public class TwoWeekDto {
/**
* 人员姓名
*/
private String userName;
/**
* 班组id
*/
private Long teamId;
/**
* 工种
*/
private String typeOfWork;
/**
* 项目id
*/
private Long projectId;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamCreateReq.java
View File

@ -51,4 +51,9 @@ public class BusProjectTeamCreateReq implements Serializable {
* 管理员Id
*/
private String userId;
/**
* 分包公司Id
*/
private Long contractorId;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamUpdateReq.java
View File

@ -52,4 +52,9 @@ public class BusProjectTeamUpdateReq implements Serializable {
* 管理员Id
*/
private String userId;
/**
* 分包公司Id
*/
private Long contractorId;
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteam/BusProjectTeamVo.java
View File

@ -88,4 +88,11 @@ public class BusProjectTeamVo implements Serializable {
* 打卡范围
*/
List<String> punchRangeList;
/**
* 分包公司Id
*/
private Long contractorId;
private String contractorName;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
View File

@ -76,4 +76,9 @@ public class BusProjectTeamMemberVo implements Serializable {
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 头像
*/
private String avatar;
}

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java
View File

@ -1,8 +1,8 @@
package org.dromara.project.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotNull;
import org.dromara.common.core.domain.R;
import org.dromara.project.domain.dto.attendance.*;
import org.dromara.project.domain.vo.BusAttendanceVo;
import org.dromara.project.domain.bo.BusAttendanceBo;
@ -13,12 +13,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.project.domain.vo.BusMonthAttendanceVo;
import org.dromara.project.domain.vo.attendance.*;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDate;
import java.util.Collection;
import java.util.List;
@ -132,9 +129,9 @@ public interface IBusAttendanceService extends IService<BusAttendance>{
List<BusMonthAttendanceVo> getMonthAttendance(Long projectId, String month);
/**
* 获取用户指定月份的打卡记录
* 获取用户打卡异常记录
*/
List<BusAttendanceVo> getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId);
TableDataInfo<BusAttendanceVo> getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId, PageQuery pageQuery);
/**
* 统计指定日期的打卡人员
@ -165,7 +162,12 @@ public interface IBusAttendanceService extends IService<BusAttendance>{
/**
* 近两周打卡统计
*/
List<BusAttendanceClockDateForTwoWeekVo> getClockDateForTwoWeekList(Long projectId);
List<BusAttendanceClockDateForTwoWeekVo> getClockDateForTwoWeekList(TwoWeekDto dto);
/**
* 获取项目当天的考勤数据
*/
BusAttendanceClockDateForTwoWeekVo getTodayAttendanceData(TwoWeekDto dto);
/**
* 获取导出的考勤数据

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java
View File

@ -13,6 +13,7 @@ import org.dromara.project.domain.dto.leave.BusLeaveQueryReq;
import org.dromara.project.domain.vo.leave.BusLeaveVo;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
@ -101,7 +102,7 @@ public interface IBusLeaveService extends IService<BusLeave> {
/**
* 查询是否请假
*/
Boolean isLeave(LocalDate date,Long userId);
Boolean isLeave(LocalDateTime clockTime, Long userId);
/**

215
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -64,6 +65,8 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import static org.dromara.project.domain.enums.BusAttendanceClockStatusEnum.ATTENDANCE_LIST;
/**
* 考勤Service业务层处理
*
@ -316,25 +319,37 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
public Boolean punchCardByFace(MultipartFile file, BusAttendancePunchCardByFaceReq req) {
// 获取当前用户
Long userId = LoginHelper.getUserId();
Long replaceId = null;
if(req.getUserId()!=null){
userId = req.getUserId();
replaceId = LoginHelper.getUserId();
}
synchronized (userId.toString().intern()) {
// 记录当前打卡时间
LocalDateTime now = LocalDateTime.now();
//打卡范围
if (!checkInRange(req)) {
throw new ServiceException("打卡位置不在范围内", HttpStatus.BAD_REQUEST);
throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
}
//用户信息校验
SubConstructionUser constructionUser = constructionUserService.getBySysUserId(userId);
final String status = "1";
if (constructionUser.getStatus().equals(status)) {
throw new ServiceException("当前用户已离职", HttpStatus.BAD_REQUEST);
if ("1".equals(constructionUser.getStatus())) {
throw new ServiceException("当前用户已离职", HttpStatus.ERROR);
}
final String noClock = "1";
if (constructionUser.getClock().equals(noClock)) {
throw new ServiceException("当前用户已被禁止打卡", HttpStatus.BAD_REQUEST);
if ("1".equals(constructionUser.getClock())) {
throw new ServiceException("当前用户已被禁止打卡", HttpStatus.ERROR);
}
//施工人员需要判断工资
if("0".equals(constructionUser.getUserRole())){
String typeOfWork = constructionUser.getTypeOfWork();
BusWorkWage workWageByWorkType = workWageService.getWorkWageByWorkType(typeOfWork);
if(constructionUser.getSalary().compareTo(BigDecimal.ZERO)==0 && workWageByWorkType == null){
throw new ServiceException("当前用户没有设置工资，禁止打卡", HttpStatus.ERROR);
}
}
// 判断用户是否已经被拉黑
constructionBlacklistService.validUserInBlacklist(constructionUser.getSysUserId(), req.getProjectId());
Boolean result = false;
@ -342,30 +357,25 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
try {
result = constructionUserService.faceComparison(file);
} catch (Exception e) {
throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.BAD_REQUEST);
throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.ERROR);
}
if (!result) {
throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.BAD_REQUEST);
throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.ERROR);
}
//打卡规则
BusAttendanceRuleVo busAttendanceRuleVo = attendanceRuleService.queryByProjectId(req.getProjectId());
if (busAttendanceRuleVo == null) {
throw new ServiceException("未设置打卡规则", HttpStatus.BAD_REQUEST);
throw new ServiceException("未设置打卡规则", HttpStatus.ERROR);
}
// 考勤时间
//确定考勤日期
LocalDate localDate = calculateAttendanceDate(now, busAttendanceRuleVo);
if (leaveService.isLeave(localDate, userId)) {
throw new ServiceException("当前用户正在请假中", HttpStatus.BAD_REQUEST);
}
// 判断当前用户打卡状态
int clockTypeByTime = getClockTypeByTime(localDate, now, busAttendanceRuleVo);
List<BusAttendance> attendances = this.lambdaQuery()
@ -390,24 +400,37 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
} else {
attendance.setClockStatus(BusAttendanceClockStatusEnum.NORMAL.getValue());
}
//只要请假，直接归为请假
LocalDateTime localDateTime = localDate.atTime(busAttendanceRuleVo.getClockInTime());
if(leaveService.isLeave(localDateTime,userId)){
attendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
}
// 填充信息
attendance.setUserId(userId);
attendance.setProjectId(req.getProjectId());
attendance.setClockDate(localDate);
attendance.setClockTime(now);
attendance.setUserName(constructionUser.getUserName());
attendance.setReplaceId(replaceId);
// 记录打卡坐标
attendance.setLat(req.getLat());
attendance.setLng(req.getLng());
try {
attendance.setClockLocation(JSTUtil.getLocationName(req.getLat(), req.getLng()));
}catch (Exception e) {
log.error("获取打卡位置失败", e);
}
// 上传人脸照
SysOssVo upload = ossService.upload(file);
attendance.setFacePic(upload.getOssId().toString());
Long finalUserId = userId;
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(userId, "打卡成功", "1");
chatServerHandler.sendSystemMessageToUser(finalUserId, "打卡成功", "1");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", userId, "打卡成功", e);
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", finalUserId, "打卡成功", e);
}
});
//计算工资
@ -431,6 +454,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.NORMAL.getValue());
busAttendance.setMinuteCount(0);
}
//只要请假，直接归为请假
LocalDateTime localDateTime = localDate.atTime(busAttendanceRuleVo.getClockInTime());
if(leaveService.isLeave(localDateTime,userId)){
busAttendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
}
updateById(busAttendance);
} else {
BusAttendance attendance = new BusAttendance();
@ -444,25 +472,36 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
} else {
attendance.setClockStatus(BusAttendanceClockStatusEnum.NORMAL.getValue());
}
//只要请假，直接归为请假
LocalDateTime localDateTime = localDate.atTime(busAttendanceRuleVo.getClockInTime());
if(leaveService.isLeave(localDateTime,userId)){
attendance.setClockStatus(BusAttendanceClockStatusEnum.LEAVE.getValue());
}
// 填充信息
attendance.setUserId(userId);
attendance.setProjectId(req.getProjectId());
attendance.setClockDate(localDate);
attendance.setClockTime(now);
attendance.setUserName(constructionUser.getUserName());
attendance.setReplaceId(replaceId);
// 记录打卡坐标
attendance.setLat(req.getLat());
attendance.setLng(req.getLng());
try {
attendance.setClockLocation(JSTUtil.getLocationName(req.getLat(), req.getLng()));
}catch (Exception e) {
log.error("获取打卡位置失败", e);
}
// 上传人脸照
SysOssVo upload = ossService.upload(file);
attendance.setFacePic(upload.getOssId().toString());
Long finalUserId1 = userId;
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(userId, "打卡成功", "1");
chatServerHandler.sendSystemMessageToUser(finalUserId1, "打卡成功", "1");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", userId, "打卡成功", e);
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", finalUserId1, "打卡成功", e);
}
});
//计算工资
@ -589,6 +628,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
Long userId = LoginHelper.getUserId();
Long projectId = req.getProjectId();
SysUserVo sysUserVo = userService.queryById(userId);
//判断是否要求范围内打卡
BusUserProjectRelevancy relevancy = userProjectRelevancyService.getOne(Wrappers.lambdaQuery(BusUserProjectRelevancy.class)
.eq(BusUserProjectRelevancy::getUserId, userId)
@ -598,7 +639,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
throw new ServiceException("当前用户未加入项目", HttpStatus.BAD_REQUEST);
}
//判断是否是施工员 管理员返回项目全部打卡范围，施工人员返回班组打卡范围
boolean isConstruct = "1".equals(relevancy.getUserType());
boolean isConstruct = "0".equals(sysUserVo.getAppUserType());
List<Long> rangeIds = new ArrayList<>();
if (isConstruct) {
BusProjectTeamMember one = projectTeamMemberService.getOne(Wrappers.lambdaQuery(BusProjectTeamMember.class)
@ -636,7 +677,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
.toList();
if (CollUtil.isEmpty(punchRangeList)) {
throw new ServiceException(isConstruct ? "班组未配置考勤范围" : "项目未配置考勤范围", HttpStatus.BAD_REQUEST);
throw new ServiceException(isConstruct ? "班组未配置考勤范围" : "项目未配置考勤范围", HttpStatus.ERROR);
}
List<GeoPoint> matchingRange = JSTUtil.findMatchingRange(req.getLat(), req.getLng(), punchRangeList);
return matchingRange != null;
@ -707,7 +748,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
@Override
public List<BusAttendanceVo> getAbnormalAttendance(Long projectId) {
public TableDataInfo<BusAttendanceVo> getAbnormalAttendance(Long projectId, PageQuery pageQuery) {
List<String> abnormalList = Arrays.asList(BusAttendanceClockStatusEnum.LATE.getValue(),
BusAttendanceClockStatusEnum.LEAVEEARLY.getValue(),
@ -722,16 +763,18 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
boolean b = relevancyList.stream().allMatch(relevancy -> "1".equals(relevancy.getUserType()));
List<BusAttendanceVo> busAttendanceVos = baseMapper.selectVoList(Wrappers.lambdaQuery(BusAttendance.class)
IPage<BusAttendanceVo> busAttendanceVoIPage = baseMapper.selectVoPage(pageQuery.build(), Wrappers.lambdaQuery(BusAttendance.class)
.eq(BusAttendance::getUserId, userId)
.eq(b, BusAttendance::getProjectId, projectId)
.in(BusAttendance::getClockStatus, abnormalList)
.orderByDesc(BusAttendance::getClockDate)
.orderByDesc(BusAttendance::getRuleTime)
);
//转换星期几
for (BusAttendanceVo busAttendanceVo : busAttendanceVos) {
for (BusAttendanceVo busAttendanceVo : busAttendanceVoIPage.getRecords()) {
busAttendanceVo.setWeek(busAttendanceVo.getClockDate().getDayOfWeek().getValue());
}
return busAttendanceVos;
return TableDataInfo.build(busAttendanceVoIPage);
}
/**
@ -1145,28 +1188,37 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
}
@Override
public List<BusAttendanceClockDateForTwoWeekVo> getClockDateForTwoWeekList(Long projectId) {
public List<BusAttendanceClockDateForTwoWeekVo> getClockDateForTwoWeekList(TwoWeekDto dto) {
LocalDate now = LocalDate.now();
//查询所有管理员和分包人员 排除
List<Long> excludeUserIds = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
.ne(SubConstructionUser::getUserRole, "0")
).stream().map(SubConstructionUser::getSysUserId).toList();
// List<Long> excludeUserIds = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
// .ne(SubConstructionUser::getUserRole, "0")
// ).stream().map(SubConstructionUser::getSysUserId).toList();
List<Long> allUserIds = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
.eq(SubConstructionUser::getUserRole, "0")
.eq(SubConstructionUser::getProjectId,projectId)
.eq(SubConstructionUser::getProjectId,dto.getProjectId())
.eq(dto.getTeamId()!=null,SubConstructionUser::getTeamId,dto.getTeamId())
.eq(StrUtil.isNotBlank(dto.getTypeOfWork()),SubConstructionUser::getTypeOfWork,dto.getTypeOfWork())
.like(StrUtil.isNotBlank(dto.getUserName()),SubConstructionUser::getUserName,dto.getUserName())
.isNotNull(SubConstructionUser::getTeamId)
).stream().map(SubConstructionUser::getSysUserId).toList();
// 往前14天，包含今天
LocalDate startDate = now.minusDays(14);
List<BusAttendance> list = list(Wrappers.<BusAttendance>lambdaQuery()
.eq(BusAttendance::getProjectId, projectId)
.notIn(CollectionUtil.isNotEmpty(excludeUserIds),BusAttendance::getUserId, excludeUserIds)
.between(BusAttendance::getClockDate, startDate, now)
LocalDate endDate = now.minusDays(1);
List<BusAttendance> list;
if(CollectionUtil.isEmpty(allUserIds)){
list = new ArrayList<>();
}else {
list = list(Wrappers.<BusAttendance>lambdaQuery()
.in(BusAttendance::getUserId, allUserIds)
.between(BusAttendance::getClockDate, startDate, endDate)
.orderByAsc(BusAttendance::getClockDate)
);
}
// 按日期分组
Map<LocalDate, List<BusAttendance>> groupedByDate = list.stream()
@ -1183,10 +1235,9 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
// 统计全勤、半勤、缺卡人数
List<BusAttendanceClockDateForTwoWeekVo> result = new ArrayList<>();
List<String> validStatusList = Arrays.asList("1", "2", "3", "5");
LocalDate currentDate = startDate;
while (!currentDate.isAfter(now)) {
while (!currentDate.isAfter(endDate)) {
Map<Long, List<BusAttendance>> userAttendanceMap = dateUserMap.getOrDefault(currentDate, new HashMap<>());
int full = 0, half = 0, absent = 0;
@ -1196,7 +1247,80 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
long validCount = records.stream()
.map(BusAttendance::getClockStatus)
.filter(validStatusList::contains)
.filter(ATTENDANCE_LIST::contains)
.count();
if (validCount >= 1) {
full++;
} else {
absent++;
}
}
BusAttendanceClockDateForTwoWeekVo vo = new BusAttendanceClockDateForTwoWeekVo();
vo.setClockDate(currentDate);
vo.setAttendance(full);
vo.setHalfAttendance(half);
vo.setAbsenteeism(absent);
result.add(vo);
currentDate = currentDate.plusDays(1);
}
return result;
}
@Override
public BusAttendanceClockDateForTwoWeekVo getTodayAttendanceData(TwoWeekDto dto) {
LocalDate now = LocalDate.now();
// //查询所有管理员和分包人员 排除
// List<Long> excludeUserIds = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
// .ne(SubConstructionUser::getUserRole, "0")
// ).stream().map(SubConstructionUser::getSysUserId).toList();
List<Long> allUserIds = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
.eq(SubConstructionUser::getUserRole, "0")
.eq(SubConstructionUser::getProjectId,dto.getProjectId())
.eq(dto.getTeamId()!=null,SubConstructionUser::getTeamId,dto.getTeamId())
.eq(StrUtil.isNotBlank(dto.getTypeOfWork()),SubConstructionUser::getTypeOfWork,dto.getTypeOfWork())
.like(StrUtil.isNotBlank(dto.getUserName()),SubConstructionUser::getUserName,dto.getUserName())
.isNotNull(SubConstructionUser::getTeamId)
).stream().map(SubConstructionUser::getSysUserId).toList();
//当天请假人数
String todayStr = now.format(DateTimeFormatter.ISO_LOCAL_DATE); // 结果："2024-10-10"
// 2. 拼接 SQL 时添加单引号，确保语法正确
int count = (int)leaveService.count(Wrappers.<BusLeave>lambdaQuery()
.eq(BusLeave::getTimeType, "2")
// 关键：给日期字符串加单引号，避免 SQL 语法错误
.apply("DATE(start_time) <= {0}", todayStr)
.apply("DATE(end_time) >= {0}", todayStr)
);
List<BusAttendance> list;
if(CollectionUtil.isEmpty(allUserIds)){
list = new ArrayList<>();
}else {
list = list(Wrappers.<BusAttendance>lambdaQuery()
.in(CollectionUtil.isNotEmpty(allUserIds),BusAttendance::getUserId, allUserIds)
.eq(BusAttendance::getClockDate, now)
.orderByAsc(BusAttendance::getClockDate)
);
}
Map<Long, List<BusAttendance>> collect = list.stream().collect(Collectors.groupingBy(BusAttendance::getUserId));
int full = 0, half = 0, absent = 0;
for (Map.Entry<Long, List<BusAttendance>> userEntry : collect.entrySet()) {
List<BusAttendance> records = userEntry.getValue();
long validCount = records.stream()
.map(BusAttendance::getClockStatus)
.filter(ATTENDANCE_LIST::contains)
.count();
if (validCount >= 2) {
@ -1209,23 +1333,16 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
}
BusAttendanceClockDateForTwoWeekVo vo = new BusAttendanceClockDateForTwoWeekVo();
vo.setClockDate(currentDate);
vo.setClockDate(now);
vo.setAttendance(full);
vo.setHalfAttendance(half);
vo.setAbsenteeism(absent);
//如果是当天，则计算考勤率
if (currentDate.equals(now)) {
vo.setAllUserNum(allUserIds.size());
//计算考勤率
vo.setAllUserNum(allUserIds.size()- count);
vo.setClockNum(full+half);
vo.setAttendanceRate(BigDecimalUtil.toPercentage(new BigDecimal(full+half),
new BigDecimal(allUserIds.size())));
}
result.add(vo);
currentDate = currentDate.plusDays(1);
}
return result;
new BigDecimal(vo.getAllUserNum())));
return vo;
}
@Override

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java
View File

@ -371,15 +371,13 @@ public class BusLeaveServiceImpl extends ServiceImpl<BusLeaveMapper, BusLeave>
@Override
public Boolean isLeave(LocalDate date, Long userId) {
LocalDateTime dateStart = LocalDateTime.of(date, LocalTime.MIN);
LocalDateTime dateEnd = LocalDateTime.of(date, LocalTime.MAX);
public Boolean isLeave(LocalDateTime clockTime, Long userId) {
LambdaQueryWrapper<BusLeave> wrappers = new LambdaQueryWrapper<>();
wrappers.eq(BusLeave::getUserId, userId)
.eq(BusLeave::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())
.le(BusLeave::getStartTime, dateEnd) // 请假开始时间 <= 当天结束时间
.ge(BusLeave::getEndTime, dateStart); // 请假结束时间 >= 当天开始时间
.le(BusLeave::getStartTime, clockTime) // 请假开始时间 <= 当天打卡时间
.ge(BusLeave::getEndTime, clockTime); // 请假结束时间 >= 当天打卡时间
return count(wrappers) > 0;
}

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
View File

@ -33,8 +33,10 @@ import org.dromara.project.mapper.BusProjectTeamMemberMapper;
import org.dromara.project.service.*;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.SysUserRole;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserRoleMapper;
import org.dromara.system.service.ISysOssService;
import org.dromara.system.service.ISysRoleService;
import org.dromara.system.service.ISysUserService;
import org.springframework.beans.BeanUtils;
@ -84,6 +86,9 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
@Resource
private ISysRoleService roleService;
@Resource
private ISysOssService ossService;
/**
* 查询项目班组下的成员
@ -366,6 +371,13 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
SysUserVo userVo = userService.selectUserById(memberId);
if (userVo != null) {
projectTeamMemberVo.setMemberName(userVo.getNickName());
Long avatar = userVo.getAvatar();
if(avatar != null){
SysOssVo byId = ossService.getById(avatar);
if(byId != null){
projectTeamMemberVo.setAvatar(byId.getUrl());
}
}
} else {
SubConstructionUser user = constructionUserService.getBySysUserId(memberId);
projectTeamMemberVo.setMemberName(user.getUserName());

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
View File

@ -16,7 +16,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.domain.SubContractor;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.contractor.service.ISubContractorService;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.BusProjectPunchrange;
import org.dromara.project.domain.BusProjectTeam;
import org.dromara.project.domain.BusProjectTeamMember;
@ -70,6 +73,9 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
@Resource
private ISysUserService userService;
@Resource
private ISubContractorService contractorService;
/**
* 查询项目班组
@ -345,6 +351,14 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
return projectTeamVo;
}
BeanUtils.copyProperties(projectTeam, projectTeamVo);
if (projectTeam.getContractorId() != null) {
SubContractor subContractor = contractorService.getById(projectTeam.getContractorId());
if (subContractor != null) {
projectTeamVo.setContractorName(subContractor.getName());
}
}
// 获取班组人数
Long peopleNumber = projectTeamMemberService.lambdaQuery()
.eq(BusProjectTeamMember::getTeamId, projectTeam.getId())
@ -436,7 +450,9 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
List<SysUserVo> sysUserVos = userService.selectUserByIds(userIdList, null);
Map<Long, String> collect = sysUserVos.stream().collect(Collectors.toMap(SysUserVo::getUserId, SysUserVo::getNickName));
List<Long> list1 = projectTeamList.stream().map(BusProjectTeam::getContractorId).toList();
List<SubContractor> subContractors = contractorService.listByIds(list1);
Map<Long, String> contractorMap = subContractors.stream().collect(Collectors.toMap(SubContractor::getId, SubContractor::getName));
// 对象列表 => 封装对象列表
List<BusProjectTeamVo> projectTeamVoList = projectTeamList.stream().map(projectTeam -> {
@ -449,6 +465,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
String[] split = userId.split(",");
projectTeamVo.setUserName(Arrays.stream(split).map(s -> collect.getOrDefault(Long.valueOf(s.trim()), "")).collect(Collectors.joining(",")));
}
projectTeamVo.setContractorName(contractorMap.getOrDefault(projectTeam.getContractorId(), ""));
return projectTeamVo;
}).toList();
projectTeamVoPage.setRecords(projectTeamVoList);

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java
View File

@ -17,6 +17,7 @@ import org.dromara.common.web.core.BaseController;
import org.dromara.system.domain.SysMenu;
import org.dromara.system.domain.bo.SysMenuBo;
import org.dromara.system.domain.vo.MenuTreeSelectVo;
import org.dromara.system.domain.vo.MetaVo;
import org.dromara.system.domain.vo.RouterVo;
import org.dromara.system.domain.vo.SysMenuVo;
import org.dromara.system.service.ISysMenuService;
@ -56,6 +57,17 @@ public class SysMenuController extends BaseController {
return R.ok(menuService.buildMenus(menus));
}
@GetMapping("/getAppRouters/{projectId}")
public R<List<SysMenuVo>> getRoutersList(@NotNull(message = "项目主键不能为空")
@PathVariable Long projectId) {
Long userId = LoginHelper.getUserId();
SysMenuBo sysMenuBo = new SysMenuBo();
sysMenuBo.setMenuSource("2");
sysMenuBo.setProjectId(projectId);
List<SysMenuVo> menus = menuService.selectMenuList(sysMenuBo, userId);
return R.ok(menus);
}
/**
* 获取菜单列表
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
View File

@ -387,7 +387,7 @@ public class SysUserController extends BaseController {
* 获取分包单位列表
*/
@SaCheckPermission("system:user:updateFb")
@PutMapping("/{projectId}")
@GetMapping("/fb/{projectId}")
public R<List<SubContractor>> getFbList(@PathVariable("projectId") Long projectId) {
List<SubContractor> list = contractorService.list(Wrappers.<SubContractor>lambdaQuery()
.select(SubContractor::getId, SubContractor::getName)
@ -400,7 +400,7 @@ public class SysUserController extends BaseController {
* 修改分包单位
*/
@SaCheckPermission("system:user:updateFb")
@PutMapping("/{userId}/{contractorId}")
@PutMapping("/fb/{userId}/{contractorId}")
public R<Boolean> updateFb(@PathVariable("userId") Long userId,
@PathVariable("contractorId") Long contractorId) {
return R.ok(userService.updateFb(userId, contractorId));

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java
View File

@ -113,4 +113,7 @@ public class SysMenuBo extends BaseEntity {
*/
private String menuSource;
private Long projectId;
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
View File

@ -136,5 +136,5 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
List<SysUserVo> selectUserListByAppUserType(@Param("appUserType") String appUserType, @Param("projectId")Long projectId);
List<SysUserVo> selectUserListByAppUserType(@Param("appUserType") String appUserType, @Param("projectId")Long projectId, @Param("contractorId")Long contractorId);
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
View File

@ -273,7 +273,7 @@ public interface ISysUserService {
Boolean queryProjectRelevancy(Long userId);
List<SysUserVo> selectUserListByAppUserType(String appUserType,Long projectId);
List<SysUserVo> selectUserListByAppUserType(String appUserType,Long projectId,Long contractorId);
Boolean updateFb(Long userId,Long contractorId);
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
View File

@ -77,7 +77,14 @@ public class SysMenuServiceImpl implements ISysMenuService {
.orderByAsc(SysMenu::getOrderNum));
} else {
QueryWrapper<SysMenu> wrapper = Wrappers.query();
wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId)
// 构建子查询的基础SQL
StringBuilder subSql = new StringBuilder("select role_id from sys_user_role where user_id = " + userId);
// 如果projectId有值，追加条件
if (menu.getProjectId() != null) {
subSql.append(" and project_id = ").append(menu.getProjectId());
}
wrapper.inSql("r.role_id", subSql.toString())
.like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
.eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
.eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@ -960,8 +960,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
}
@Override
public List<SysUserVo> selectUserListByAppUserType(String appUserType,Long projectId) {
return baseMapper.selectUserListByAppUserType(appUserType,projectId);
public List<SysUserVo> selectUserListByAppUserType(String appUserType,Long projectId,Long contractorId) {
return baseMapper.selectUserListByAppUserType(appUserType,projectId,contractorId);
}

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -135,6 +135,7 @@
WHERE
bur.project_id = #{projectId}
AND su.app_user_type = #{appUserType}
AND su.contractor_id = #{contractorId}
AND su.del_flag = '0'
AND su.status = '0'
</select>