From 5df3bb7baf4fa941ca7ed8b6b0dace6b786687f9 Mon Sep 17 00:00:00 2001 From: zt Date: Sat, 11 Oct 2025 19:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C=E5=88=86?= =?UTF-8?q?=E5=8C=85=E8=A1=A5=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MatMaterialsController.java | 15 ++++++ .../controller/app/BusLeaveAppController.java | 25 +++++++++- .../app/BusReissueCardAppController.java | 15 ++++-- .../org/dromara/project/domain/BusLeave.java | 6 +++ .../project/domain/BusReissueCard.java | 6 +++ .../domain/dto/leave/BusLeaveAddReq.java | 5 ++ .../domain/dto/leave/BusLeaveQueryReq.java | 4 ++ .../dto/reissuecard/BusReissueCardAddReq.java | 5 ++ .../reissuecard/BusReissueCardQueryReq.java | 6 ++- .../project/service/IBusLeaveService.java | 16 ++++++ .../service/IBusReissueCardService.java | 7 ++- .../impl/BusAttendanceServiceImpl.java | 2 +- .../service/impl/BusLeaveServiceImpl.java | 50 +++++++++++++++++++ .../impl/BusReissueCardServiceImpl.java | 23 +++++++++ .../impl/QltQualityInspectionServiceImpl.java | 1 + .../domain/vo/WgzQuestionSavePdfVo.java | 2 +- .../impl/HseSafetyInspectionServiceImpl.java | 3 ++ 17 files changed, 182 insertions(+), 9 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java index d17d5b47..5ec39413 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java @@ -15,6 +15,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.materials.domain.dto.materials.MatMaterialsCreateReq; import org.dromara.materials.domain.dto.materials.MatMaterialsGisReq; import org.dromara.materials.domain.dto.materials.MatMaterialsQueryReq; @@ -40,6 +43,8 @@ public class MatMaterialsController extends BaseController { private final IMatMaterialsService materialsService; + private final ISubContractorService contractorService; + /** * 查询材料列表 */ @@ -155,4 +160,14 @@ public class MatMaterialsController extends BaseController { @PathVariable Long[] ids) { return toAjax(materialsService.deleteWithValidByIds(List.of(ids), true)); } + + + /** + * 查询分包单位列表 + */ + @SaCheckPermission("materials:materials:contractorList") + @GetMapping("/contractorList") + public R> contractorList(SubContractorQueryReq req) { + return R.ok(contractorService.queryList(req)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusLeaveAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusLeaveAppController.java index 4e9fea7a..9ef42953 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusLeaveAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusLeaveAppController.java @@ -12,7 +12,9 @@ import org.dromara.common.web.core.BaseController; import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.project.domain.dto.leave.BusLeaveAddReq; import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; +import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import org.dromara.project.service.IBusLeaveService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,12 +40,31 @@ public class BusLeaveAppController extends BaseController { */ @GetMapping("/list/loginUser") public TableDataInfo listByLoginUser(BusLeaveQueryReq req, PageQuery pageQuery) { -// SubConstructionUser constructionUser = constructionUserService.getBySysUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId()); - //管理员呢 return leaveService.listByLoginUser(req, pageQuery); } + /** + * 查询当前登录用户补卡审批列表 + */ + @GetMapping("/list/auditUser") + public TableDataInfo listByAuditUser(BusLeaveQueryReq req, PageQuery pageQuery) { + req.setGangerId(LoginHelper.getUserId()); + return leaveService.listByAuditUser(req, pageQuery); + } + + + /** + * 查询角色补卡审批列表 + */ + @GetMapping("/list/auditRole") + public TableDataInfo listByAuditRole(BusLeaveQueryReq req, PageQuery pageQuery) { + return leaveService.listByAuditRole(req, pageQuery); + } + + + + /** * 提交请假 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusReissueCardAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusReissueCardAppController.java index 2f6c4483..27f1520e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusReissueCardAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusReissueCardAppController.java @@ -75,10 +75,19 @@ public class BusReissueCardAppController extends BaseController { */ @GetMapping("/list/auditUser") public TableDataInfo listByAuditUser(BusReissueCardQueryReq req, PageQuery pageQuery) { -// SubConstructionUser constructionUser = constructionUserService.getBySysUserId(LoginHelper.getUserId()); req.setGangerId(LoginHelper.getUserId()); return reissueCardService.listByAuditUser(req, pageQuery); } + + + /** + * 查询角色补卡审批列表 + */ + @GetMapping("/list/auditRole") + public TableDataInfo listByAuditRole(BusReissueCardQueryReq req, PageQuery pageQuery) { + return reissueCardService.listByAuditRole(req, pageQuery); + } + /** * 获取施工人员补卡申请详细信息 * @@ -91,9 +100,9 @@ public class BusReissueCardAppController extends BaseController { } /** - * 修改补卡申请 + * 审核 */ - @Log(title = "修改补卡申请", businessType = BusinessType.UPDATE) + @Log(title = "审核补卡申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("") public R managerReview(@RequestBody BusReissueCardUpdateReq req) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusLeave.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusLeave.java index a94e2f42..7ec0dae7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusLeave.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusLeave.java @@ -149,4 +149,10 @@ public class BusLeave extends BaseEntity { * 时间段类型 1-上午 2-下午 */ private String periodType; + + + /** + * 申请人类型（0-施工人员 1-管理人员 2-分包人员） + */ + private String userType; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java index f13ff532..355f5a95 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java @@ -130,4 +130,10 @@ public class BusReissueCard extends BaseEntity { */ private String status; + + /** + * 申请人类型（0-施工人员 1-管理人员 2-分包人员） + */ + private String userType; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveAddReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveAddReq.java index 612459c1..9bcf1bb1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveAddReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveAddReq.java @@ -64,4 +64,9 @@ public class BusLeaveAddReq implements Serializable { * 时间段类型 1-上午 2-下午 */ private String periodType; + + /** + * 申请人类型（0-施工人员 1-管理人员 2-分包人员） + */ + private String userType; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java index 7266f5b9..bb9b2d3d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; +import java.util.List; /** * @author lilemy @@ -73,4 +74,7 @@ public class BusLeaveQueryReq implements Serializable { */ private LocalDate date; + + private List roleIds; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardAddReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardAddReq.java index fc912cfb..cf5ee544 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardAddReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardAddReq.java @@ -63,4 +63,9 @@ public class BusReissueCardAddReq implements Serializable { * 补卡类型（1上班 2下班） */ private String reissueCardType; + + /** + * 申请人类型（0-施工人员 1-管理人员 2-分包人员） + */ + private String userType; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java index 517542b7..29dae9f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; +import java.util.List; /** * @author lilemy @@ -78,5 +79,8 @@ public class BusReissueCardQueryReq implements Serializable { */ private LocalDate date; - + /** + * 角色id + */ + private List roleIds; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java index d3b27fb9..7e517aba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java @@ -10,7 +10,9 @@ import org.dromara.project.domain.dto.leave.BusLeaveAddReq; import org.dromara.project.domain.dto.leave.BusLeaveGangerReviewReq; import org.dromara.project.domain.dto.leave.BusLeaveManagerReviewReq; import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; +import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import java.time.LocalDate; import java.time.LocalDateTime; @@ -114,4 +116,18 @@ public interface IBusLeaveService extends IService { * 查询当前登录用户请假申请列表 */ TableDataInfo listByLoginUser(BusLeaveQueryReq req, PageQuery pageQuery); + + /** + * 审批列表(班组长和分包管理) + */ + TableDataInfo listByAuditUser(BusLeaveQueryReq req, PageQuery pageQuery); + + /** + * 审批列表(角色) + */ + TableDataInfo listByAuditRole(BusLeaveQueryReq req, PageQuery pageQuery); + + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java index c1da8159..f3128bd3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java @@ -97,10 +97,15 @@ public interface IBusReissueCardService extends IService { TableDataInfo listByLoginUser(BusReissueCardQueryReq req, PageQuery pageQuery); /** - * 审批列表 + * 审批列表(班组长和分包管理) */ TableDataInfo listByAuditUser(BusReissueCardQueryReq req, PageQuery pageQuery); + /** + * 审批列表(角色) + */ + TableDataInfo listByAuditRole(BusReissueCardQueryReq req, PageQuery pageQuery); + /** * 新增施工人员补卡申请 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 47eb9f77..c0fe65fd 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 @@ -538,7 +538,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl records = entry.getValue(); boolean allValid = records.stream() - .allMatch(record -> ATTENDANCE_STATUS.contains(record.getClockStatus())); + .anyMatch(record -> ATTENDANCE_STATUS.contains(record.getClockStatus())); if (allValid) { attendedUserIds.add(userId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java index b888e88c..10747220 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -30,10 +31,12 @@ import org.dromara.contractor.service.ISubContractorService; import org.dromara.project.domain.*; import org.dromara.project.domain.dto.leave.BusLeaveAddReq; import org.dromara.project.domain.dto.leave.BusLeaveGangerReviewReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.enums.*; import org.dromara.project.domain.dto.leave.BusLeaveManagerReviewReq; import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; +import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import org.dromara.project.mapper.BusLeaveMapper; import org.dromara.project.service.*; import org.dromara.workflow.domain.TestLeave; @@ -441,6 +444,53 @@ public class BusLeaveServiceImpl extends ServiceImpl return TableDataInfo.build(this.getVoPage(result)); } + + @Override + public TableDataInfo listByAuditUser(BusLeaveQueryReq req, PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.orderByDesc(BusLeave::getCreateTime); + lqw.eq(ObjectUtils.isNotEmpty(req.getGangerId()), BusLeave::getGangerId, req.getGangerId()); + lqw.like(StrUtil.isNotBlank(req.getUserName()), BusLeave::getUserName, req.getUserName()); + Page result = this.page(pageQuery.build(), lqw); + return TableDataInfo.build(this.getVoPage(result)); + } + + @Override + public TableDataInfo listByAuditRole(BusLeaveQueryReq req, PageQuery pageQuery) { + //两个角色 一个审核分包的=6，一个审核管理的=7 + List roleIds = req.getRoleIds(); + List type = new ArrayList<>(); + if(roleIds.contains(7L)){ + type.add("7"); + } + if(roleIds.contains(6L)){ + type.add("6"); + } + if(CollUtil.isEmpty(type)){ + return TableDataInfo.build(); + } + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.orderByDesc(BusLeave::getCreateTime); + lqw.like(StrUtil.isNotBlank(req.getUserName()), BusLeave::getUserName, req.getUserName()); + lqw.in(BusLeave::getUserType, type); + Page result = this.page(pageQuery.build(), lqw); + return TableDataInfo.build(this.getVoPage(result)); + } + + + + + + + + + + + + + + /** * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1' diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java index 33aadb75..41bbe8e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java @@ -363,6 +363,29 @@ public class BusReissueCardServiceImpl extends ServiceImpl listByAuditRole(BusReissueCardQueryReq req, PageQuery pageQuery) { + //两个角色 一个审核分包的=6，一个审核管理的=7 + List roleIds = req.getRoleIds(); + List type = new ArrayList<>(); + if(roleIds.contains(7L)){ + type.add("7"); + } + if(roleIds.contains(6L)){ + type.add("6"); + } + if(CollUtil.isEmpty(type)){ + return TableDataInfo.build(); + } + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.orderByDesc(BusReissueCard::getCreateTime); + lqw.like(StrUtil.isNotBlank(req.getUserName()), BusReissueCard::getUserName, req.getUserName()); + lqw.in(BusReissueCard::getUserType, type); + Page result = this.page(pageQuery.build(), lqw); + return TableDataInfo.build(this.getVoPage(result)); + } + @Override public Long add(BusReissueCardAddReq req) { BusReissueCard bean = BeanUtil.toBean(req, BusReissueCard.class); 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 318fb2c1..383a616c 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 @@ -366,6 +366,7 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl result = this.page(pageQuery.build(), lqw); return TableDataInfo.build(this.getVoPage(result)); }