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

安全

Browse Source
This commit is contained in:
zt
2025-09-25 10:24:39 +08:00
parent bc41175162
commit 1de11bb110
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
.set(SubConstructionUser::getEntryDate, new Date()) .set(SubConstructionUser::getEntryDate, new Date())
.set(SubConstructionUser::getLeaveDate, null) .set(SubConstructionUser::getLeaveDate, null)
.set(SubConstructionUser::getExitStatus, "0") .set(SubConstructionUser::getExitStatus, "0")
.set(SubConstructionUser::getTypeOfWork,req.getTypeOfWork())
.set(constructionUser.getFirstDate() == null, SubConstructionUser::getFirstDate, LocalDate.now()); .set(constructionUser.getFirstDate() == null, SubConstructionUser::getFirstDate, LocalDate.now());
constructionUserService.update(constructionUserLuw); constructionUserService.update(constructionUserLuw);

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java
View File

@ -55,4 +55,11 @@ public class HseSafetyInspectionQueryReq implements Serializable {
*/ */
private String reviewType; private String reviewType;
/**
* 整改人
*/
private Long correctorId;
private Long createBy;
} }

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -127,17 +127,19 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
@Override @Override
public TableDataInfo<HseSafetyInspectionVo> queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { public TableDataInfo<HseSafetyInspectionVo> queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) {
LambdaQueryWrapper<HseSafetyInspection> lqw = this.buildQueryWrapper(req); LambdaQueryWrapper<HseSafetyInspection> lqw = this.buildQueryWrapper(req);
Long userId = LoginHelper.getUserId(); lqw.eq(req.getCorrectorId()!= null, HseSafetyInspection::getCorrectorId, req.getCorrectorId());
if (userId != null) { lqw.eq(req.getCreateBy() != null, HseSafetyInspection::getCreateBy, req.getCreateBy());
BusProjectTeamMember one = projectTeamMemberService.lambdaQuery() // Long userId = LoginHelper.getUserId();
.eq(BusProjectTeamMember::getMemberId, userId) // if (userId != null) {
.eq(BusProjectTeamMember::getPostId, "0") // BusProjectTeamMember one = projectTeamMemberService.lambdaQuery()
.last("limit 1") // .eq(BusProjectTeamMember::getMemberId, userId)
.one(); // .eq(BusProjectTeamMember::getPostId, "0")
if (one != null) { // .last("limit 1")
lqw.eq(HseSafetyInspection::getCorrectorId, userId); // .one();
} // if (one != null) {
} // lqw.eq(HseSafetyInspection::getCorrectorId, userId);
// }
// }
Page<HseSafetyInspection> result = this.page(pageQuery.build(), lqw); Page<HseSafetyInspection> result = this.page(pageQuery.build(), lqw);
return TableDataInfo.build(this.getVoPage(result)); return TableDataInfo.build(this.getVoPage(result));
} }