diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java index b141e8ab..9dcc7e13 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java @@ -110,6 +110,7 @@ public class OutConstructionValueRangeServiceImpl extends ServiceImpl getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -118,8 +136,6 @@ public class HazardHiddenDangerController extends BaseController { return R.ok(count); } - - /** * 隐患级别列表 */ @@ -129,11 +145,10 @@ public class HazardHiddenDangerController extends BaseController { return R.ok(list); } - /** * 评估隐患 */ - @SaCheckPermission("safety:hiddenDanger:edit") + @SaCheckPermission("safety:hiddenDanger:evaluate") @Log(title = "隐患信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/evaluate") @@ -142,19 +157,54 @@ public class HazardHiddenDangerController extends BaseController { } + /** + * 分包单位列表 + * @param projectId 项目ID + */ + @GetMapping("/contractorList") + public R> contractorList(Long projectId) { + List list = contractorService.lambdaQuery() + .select(SubContractor::getId, SubContractor::getName) + .eq(SubContractor::getProjectId, projectId) + .list(); + return R.ok(list); + } + /** + * 分包人员列表 + * @param contractorId 分包ID + */ + @GetMapping("/contractorUserList") + public R> contractorUserList(Long contractorId) { + List sysUsers = userService.selectUserListByContractorId(contractorId); + return R.ok(sysUsers); + } + /** + * 班组列表 + * @param projectId 项目ID + */ + @GetMapping("/teamList") + public R> teamList(Long projectId) { + List list = projectTeamService.lambdaQuery() + .select(BusProjectTeam::getId, BusProjectTeam::getTeamName) + .eq(BusProjectTeam::getProjectId, projectId) + .list(); + return R.ok(list); + } - - - - - - - - - - + /** + * 班组长列表 + * @param teamId 班组ID + */ + @GetMapping("/teamUserList") + public R> teamUserList(Long teamId) { + BusProjectTeamMemberQueryReq req = new BusProjectTeamMemberQueryReq(); + req.setTeamId(teamId); + req.setPostId("1"); + List busProjectTeamMemberVos = projectTeamMemberService.queryList(req); + return R.ok(busProjectTeamMemberVos); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java new file mode 100644 index 00000000..fa3cece4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java @@ -0,0 +1,170 @@ +package org.dromara.safety.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +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.BusProjectTeam; +import org.dromara.project.service.IBusProjectTeamService; +import org.dromara.safety.domain.HseViolationRecord; +import org.dromara.safety.service.IHseViolationRecordService; +import org.dromara.system.domain.SysUser; +import org.dromara.system.service.ISysUserService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.domain.vo.HseRewardsPunishmentsVo; +import org.dromara.safety.domain.bo.HseRewardsPunishmentsBo; +import org.dromara.safety.service.IHseRewardsPunishmentsService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 奖惩记录 + * + * @author Lion Li + * @date 2025-12-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/safety/rewardsPunishments") +public class HseRewardsPunishmentsController extends BaseController { + + private final IHseRewardsPunishmentsService hseRewardsPunishmentsService; + + private final ISubContractorService contractorService; + + private final IBusProjectTeamService projectTeamService; + + private final ISubConstructionUserService constructionUserService; + + private final IHseViolationRecordService hseViolationRecordService; + /** + * 查询奖惩记录列表 + */ + @SaCheckPermission("safety:rewardsPunishments:list") + @GetMapping("/list") + public TableDataInfo list(HseRewardsPunishmentsBo bo, PageQuery pageQuery) { + return hseRewardsPunishmentsService.queryPageList(bo, pageQuery); + } + + /** + * 导出奖惩记录列表 + */ + @SaCheckPermission("safety:rewardsPunishments:export") + @Log(title = "奖惩记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseRewardsPunishmentsBo bo, HttpServletResponse response) { + List list = hseRewardsPunishmentsService.queryList(bo); + ExcelUtil.exportExcel(list, "奖惩记录", HseRewardsPunishmentsVo.class, response); + } + + /** + * 获取奖惩记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("safety:rewardsPunishments:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseRewardsPunishmentsService.queryById(id)); + } + + /** + * 新增奖惩记录 + */ + @SaCheckPermission("safety:rewardsPunishments:add") + @Log(title = "奖惩记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseRewardsPunishmentsBo bo) { + return toAjax(hseRewardsPunishmentsService.insertByBo(bo)); + } + + /** + * 修改奖惩记录 + */ + @SaCheckPermission("safety:rewardsPunishments:edit") + @Log(title = "奖惩记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseRewardsPunishmentsBo bo) { + return toAjax(hseRewardsPunishmentsService.updateByBo(bo)); + } + + /** + * 删除奖惩记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("safety:rewardsPunishments:remove") + @Log(title = "奖惩记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseRewardsPunishmentsService.deleteWithValidByIds(List.of(ids), true)); + } + + + /** + * 分包单位列表 + * @param projectId 项目ID + */ + @GetMapping("/contractorList") + public R> contractorList(Long projectId) { + List list = contractorService.lambdaQuery() + .select(SubContractor::getId, SubContractor::getName) + .eq(SubContractor::getProjectId, projectId) + .list(); + return R.ok(list); + } + + /** + * 班组列表 + * @param projectId 项目ID + */ + @GetMapping("/teamList") + public R> teamList(Long projectId) { + List list = projectTeamService.lambdaQuery() + .select(BusProjectTeam::getId, BusProjectTeam::getTeamName) + .eq(BusProjectTeam::getProjectId, projectId) + .list(); + return R.ok(list); + } + + /** + * 施工人员列表 + * @param projectId 项目ID + */ + @GetMapping("/constructUserList") + public R> constructUserList(Long projectId) { + List list = constructionUserService.lambdaQuery() + .select(SubConstructionUser::getSysUserId, SubConstructionUser::getUserName) + .eq(SubConstructionUser::getProjectId, projectId) + .isNotNull(SubConstructionUser::getTeamId) + .eq(SubConstructionUser::getUserRole, "0") + .list(); + return R.ok(list); + } + + + + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRpObjectController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRpObjectController.java new file mode 100644 index 00000000..56a310db --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRpObjectController.java @@ -0,0 +1,105 @@ +package org.dromara.safety.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.domain.vo.HseRpPersonVo; +import org.dromara.safety.domain.bo.HseRpObjectBo; +import org.dromara.safety.service.IHseRpObjectService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 奖惩对象 + * + * @author Lion Li + * @date 2025-12-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/safety/rpPerson") +public class HseRpObjectController extends BaseController { + + private final IHseRpObjectService hseRpPersonService; + + /** + * 查询奖惩对象列表 + */ + @SaCheckPermission("safety:rpPerson:list") + @GetMapping("/list") + public TableDataInfo list(HseRpObjectBo bo, PageQuery pageQuery) { + return hseRpPersonService.queryPageList(bo, pageQuery); + } + + /** + * 导出奖惩对象列表 + */ + @SaCheckPermission("safety:rpPerson:export") + @Log(title = "奖惩对象", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseRpObjectBo bo, HttpServletResponse response) { + List list = hseRpPersonService.queryList(bo); + ExcelUtil.exportExcel(list, "奖惩对象", HseRpPersonVo.class, response); + } + + /** + * 获取奖惩对象详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("safety:rpPerson:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseRpPersonService.queryById(id)); + } + + /** + * 新增奖惩对象 + */ + @SaCheckPermission("safety:rpPerson:add") + @Log(title = "奖惩对象", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseRpObjectBo bo) { + return toAjax(hseRpPersonService.insertByBo(bo)); + } + + /** + * 修改奖惩对象 + */ + @SaCheckPermission("safety:rpPerson:edit") + @Log(title = "奖惩对象", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseRpObjectBo bo) { + return toAjax(hseRpPersonService.updateByBo(bo)); + } + + /** + * 删除奖惩对象 + * + * @param ids 主键串 + */ + @SaCheckPermission("safety:rpPerson:remove") + @Log(title = "奖惩对象", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseRpPersonService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRewardsPunishments.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRewardsPunishments.java new file mode 100644 index 00000000..14fb6548 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRewardsPunishments.java @@ -0,0 +1,87 @@ +package org.dromara.safety.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 奖惩记录对象 hse_rewards_punishments + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_rewards_punishments") +public class HseRewardsPunishments extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 奖惩编号（如RP001） + */ + private String rpCode; + + /** + * 类型：1-奖励，2-惩罚 + */ + private String type; + + /** + * 分类（如AI工单、其他、安全工单等） + */ + private String category; + + /** + * 金额（元） + */ + private BigDecimal amount; + + /** + * 关联工单id + */ + private Long relatedWorkId; + + /** + * 发起人 + */ + private Long submitter; + + /** + * 奖惩对象类型（1-分包 2-班组 3-人） + */ + private String recipientType; + + /** + * 审核状态 + */ + private String status; + + /** + * 奖惩原因 + */ + private String reason; + + /** + * 附件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRpObject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRpObject.java new file mode 100644 index 00000000..8a8c71eb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRpObject.java @@ -0,0 +1,52 @@ +package org.dromara.safety.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 奖惩对象对象 hse_rp_person + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_rp_object") +public class HseRpObject extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 关联奖惩记录ID（rewards_punishments.id） + */ + private Long rpId; + + /** + * 对象id + */ + private Long objectId; + + /** + * 对象名称（人员姓名或班组名称） + */ + private String objectName; + + /** + * 个人/班组金额 + */ + private BigDecimal amount; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java new file mode 100644 index 00000000..e8bb28a2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java @@ -0,0 +1,94 @@ +package org.dromara.safety.domain.bo; + +import org.dromara.safety.domain.HseRewardsPunishments; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.util.List; + +/** + * 奖惩记录业务对象 hse_rewards_punishments + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseRewardsPunishments.class, reverseConvertGenerate = false) +public class HseRewardsPunishmentsBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 奖惩编号（如RP001） + */ + private String rpCode; + + /** + * 类型：1-奖励，2-惩罚 + */ + private String type; + + /** + * 分类（如AI工单、其他、安全工单等） + */ + private String category; + + /** + * 金额（元） + */ + private BigDecimal amount; + + /** + * 关联工单id + */ + private Long relatedWorkId; + + /** + * 发起人 + */ + @NotNull(message = "发起人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long submitter; + + /** + * 奖惩对象类型（1-分包 2-班组 3-人） + */ + private String recipientType; + + /** + * 审核状态 + */ + private String status; + + /** + * 奖惩原因 + */ + private String reason; + + /** + * 附件 + */ + private String file; + + /** + * 备注 + */ + private String remark; + + + /** + * 备注 + */ + private List persons; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRpObjectBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRpObjectBo.java new file mode 100644 index 00000000..dd24b0a4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRpObjectBo.java @@ -0,0 +1,50 @@ +package org.dromara.safety.domain.bo; + +import org.dromara.safety.domain.HseRpObject; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 奖惩对象业务对象 hse_rp_person + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseRpObject.class, reverseConvertGenerate = false) +public class HseRpObjectBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 关联奖惩记录ID（rewards_punishments.id） + */ + private Long rpId; + + /** + * 对象id + */ + private Long objectId; + + /** + * 对象名称（人员姓名或班组名称） + */ + private String objectName; + + /** + * 个人/班组金额 + */ + private BigDecimal amount; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/EvaluateDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/EvaluateDto.java index 80e01efe..2789c26f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/EvaluateDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/EvaluateDto.java @@ -52,8 +52,18 @@ public class EvaluateDto { private String reporterFile; /** - * 整改时间 + * 整改单位 1-班组 2-分包 */ - private LocalDateTime rectifyTime; + private String rectifyUnit; + + /** + * 整改单位ID + */ + private Long rectifyUnitId; + + /** + * 整改负责人Id + */ + private Long rectifyUserId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRewardsPunishmentsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRewardsPunishmentsVo.java new file mode 100644 index 00000000..bbdfaff7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRewardsPunishmentsVo.java @@ -0,0 +1,109 @@ +package org.dromara.safety.domain.vo; + +import java.math.BigDecimal; +import org.dromara.safety.domain.HseRewardsPunishments; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 奖惩记录视图对象 hse_rewards_punishments + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseRewardsPunishments.class) +public class HseRewardsPunishmentsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 奖惩编号（如RP001） + */ + @ExcelProperty(value = "奖惩编号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=RP001") + private String rpCode; + + /** + * 类型：1-奖励，2-惩罚 + */ + @ExcelProperty(value = "类型：1-奖励，2-惩罚") + private String type; + + /** + * 分类（如AI工单、其他、安全工单等） + */ + @ExcelProperty(value = "分类", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=AI工单、其他、安全工单等") + private String category; + + /** + * 金额（元） + */ + @ExcelProperty(value = "金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=") + private BigDecimal amount; + + /** + * 关联工单id + */ + @ExcelProperty(value = "关联工单id") + private Long relatedWorkId; + + /** + * 发起人 + */ + @ExcelProperty(value = "发起人") + private Long submitter; + + /** + * 奖惩对象类型（1-分包 2-班组 3-人） + */ + @ExcelProperty(value = "奖惩对象类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=-分包,2=-班组,3=-人") + private String recipientType; + + /** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String status; + + /** + * 奖惩原因 + */ + @ExcelProperty(value = "奖惩原因") + private String reason; + + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String file; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRpPersonVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRpPersonVo.java new file mode 100644 index 00000000..7e85b31e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseRpPersonVo.java @@ -0,0 +1,63 @@ +package org.dromara.safety.domain.vo; + +import java.math.BigDecimal; +import org.dromara.safety.domain.HseRpObject; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 奖惩对象视图对象 hse_rp_person + * + * @author Lion Li + * @date 2025-12-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseRpObject.class) +public class HseRpPersonVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 关联奖惩记录ID（rewards_punishments.id） + */ + @ExcelProperty(value = "关联奖惩记录ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "r=ewards_punishments.id") + private Long rpId; + + /** + * 对象id + */ + @ExcelProperty(value = "对象id") + private Long objectId; + + /** + * 对象名称（人员姓名或班组名称） + */ + @ExcelProperty(value = "对象名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "人=员姓名或班组名称") + private String objectName; + + /** + * 个人/班组金额 + */ + @ExcelProperty(value = "个人/班组金额") + private BigDecimal amount; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRewardsPunishmentsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRewardsPunishmentsMapper.java new file mode 100644 index 00000000..30de9cf5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRewardsPunishmentsMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.mapper; + +import org.dromara.safety.domain.HseRewardsPunishments; +import org.dromara.safety.domain.vo.HseRewardsPunishmentsVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 奖惩记录Mapper接口 + * + * @author Lion Li + * @date 2025-12-04 + */ +public interface HseRewardsPunishmentsMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRpObjectMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRpObjectMapper.java new file mode 100644 index 00000000..535e811d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseRpObjectMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.mapper; + +import org.dromara.safety.domain.HseRpObject; +import org.dromara.safety.domain.vo.HseRpPersonVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 奖惩对象Mapper接口 + * + * @author Lion Li + * @date 2025-12-04 + */ +public interface HseRpObjectMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationRecordMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationRecordMapper.java index 4f1d71f6..44e5e13c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationRecordMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationRecordMapper.java @@ -9,6 +9,8 @@ import org.dromara.safety.domain.HseViolationRecord; import org.dromara.safety.domain.vo.violationrecord.HseViolationRecordVo; import org.dromara.system.domain.SysUser; +import java.util.List; + /** * 违规记录Mapper接口 * @@ -18,4 +20,8 @@ import org.dromara.system.domain.SysUser; public interface HseViolationRecordMapper extends BaseMapperPlus { Page selectPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + List selectLatestList( @Param(Constants.WRAPPER) Wrapper queryWrapper); + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRewardsPunishmentsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRewardsPunishmentsService.java new file mode 100644 index 00000000..2901ba89 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRewardsPunishmentsService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.service; + +import org.dromara.safety.domain.vo.HseRewardsPunishmentsVo; +import org.dromara.safety.domain.bo.HseRewardsPunishmentsBo; +import org.dromara.safety.domain.HseRewardsPunishments; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 奖惩记录Service接口 + * + * @author Lion Li + * @date 2025-12-04 + */ +public interface IHseRewardsPunishmentsService extends IService{ + + /** + * 查询奖惩记录 + * + * @param id 主键 + * @return 奖惩记录 + */ + HseRewardsPunishmentsVo queryById(Long id); + + /** + * 分页查询奖惩记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 奖惩记录分页列表 + */ + TableDataInfo queryPageList(HseRewardsPunishmentsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的奖惩记录列表 + * + * @param bo 查询条件 + * @return 奖惩记录列表 + */ + List queryList(HseRewardsPunishmentsBo bo); + + /** + * 新增奖惩记录 + * + * @param bo 奖惩记录 + * @return 是否新增成功 + */ + Boolean insertByBo(HseRewardsPunishmentsBo bo); + + /** + * 修改奖惩记录 + * + * @param bo 奖惩记录 + * @return 是否修改成功 + */ + Boolean updateByBo(HseRewardsPunishmentsBo bo); + + /** + * 校验并批量删除奖惩记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRpObjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRpObjectService.java new file mode 100644 index 00000000..8a33fa92 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseRpObjectService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.service; + +import org.dromara.safety.domain.vo.HseRpPersonVo; +import org.dromara.safety.domain.bo.HseRpObjectBo; +import org.dromara.safety.domain.HseRpObject; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 奖惩对象Service接口 + * + * @author Lion Li + * @date 2025-12-04 + */ +public interface IHseRpObjectService extends IService{ + + /** + * 查询奖惩对象 + * + * @param id 主键 + * @return 奖惩对象 + */ + HseRpPersonVo queryById(Long id); + + /** + * 分页查询奖惩对象列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 奖惩对象分页列表 + */ + TableDataInfo queryPageList(HseRpObjectBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的奖惩对象列表 + * + * @param bo 查询条件 + * @return 奖惩对象列表 + */ + List queryList(HseRpObjectBo bo); + + /** + * 新增奖惩对象 + * + * @param bo 奖惩对象 + * @return 是否新增成功 + */ + Boolean insertByBo(HseRpObjectBo bo); + + /** + * 修改奖惩对象 + * + * @param bo 奖惩对象 + * @return 是否修改成功 + */ + Boolean updateByBo(HseRpObjectBo bo); + + /** + * 校验并批量删除奖惩对象信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java new file mode 100644 index 00000000..2c1e6ca5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.safety.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.domain.bo.HseRewardsPunishmentsBo; +import org.dromara.safety.domain.vo.HseRewardsPunishmentsVo; +import org.dromara.safety.domain.HseRewardsPunishments; +import org.dromara.safety.mapper.HseRewardsPunishmentsMapper; +import org.dromara.safety.service.IHseRewardsPunishmentsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 奖惩记录Service业务层处理 + * + * @author Lion Li + * @date 2025-12-04 + */ +@RequiredArgsConstructor +@Service +public class HseRewardsPunishmentsServiceImpl extends ServiceImpl implements IHseRewardsPunishmentsService { + + private final HseRewardsPunishmentsMapper baseMapper; + + /** + * 查询奖惩记录 + * + * @param id 主键 + * @return 奖惩记录 + */ + @Override + public HseRewardsPunishmentsVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询奖惩记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 奖惩记录分页列表 + */ + @Override + public TableDataInfo queryPageList(HseRewardsPunishmentsBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的奖惩记录列表 + * + * @param bo 查询条件 + * @return 奖惩记录列表 + */ + @Override + public List queryList(HseRewardsPunishmentsBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseRewardsPunishmentsBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseRewardsPunishments::getId); + lqw.eq(StringUtils.isNotBlank(bo.getRpCode()), HseRewardsPunishments::getRpCode, bo.getRpCode()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), HseRewardsPunishments::getType, bo.getType()); + lqw.eq(StringUtils.isNotBlank(bo.getCategory()), HseRewardsPunishments::getCategory, bo.getCategory()); + lqw.eq(bo.getAmount() != null, HseRewardsPunishments::getAmount, bo.getAmount()); + lqw.eq(bo.getRelatedWorkId() != null, HseRewardsPunishments::getRelatedWorkId, bo.getRelatedWorkId()); + lqw.eq(bo.getSubmitter() != null, HseRewardsPunishments::getSubmitter, bo.getSubmitter()); + lqw.eq(StringUtils.isNotBlank(bo.getRecipientType()), HseRewardsPunishments::getRecipientType, bo.getRecipientType()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HseRewardsPunishments::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getReason()), HseRewardsPunishments::getReason, bo.getReason()); + lqw.eq(StringUtils.isNotBlank(bo.getFile()), HseRewardsPunishments::getFile, bo.getFile()); + return lqw; + } + + /** + * 新增奖惩记录 + * + * @param bo 奖惩记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseRewardsPunishmentsBo bo) { + HseRewardsPunishments add = MapstructUtils.convert(bo, HseRewardsPunishments.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改奖惩记录 + * + * @param bo 奖惩记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseRewardsPunishmentsBo bo) { + HseRewardsPunishments update = MapstructUtils.convert(bo, HseRewardsPunishments.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseRewardsPunishments entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除奖惩记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRpObjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRpObjectServiceImpl.java new file mode 100644 index 00000000..a44a754b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRpObjectServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.safety.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.domain.bo.HseRpObjectBo; +import org.dromara.safety.domain.vo.HseRpPersonVo; +import org.dromara.safety.domain.HseRpObject; +import org.dromara.safety.mapper.HseRpObjectMapper; +import org.dromara.safety.service.IHseRpObjectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 奖惩对象Service业务层处理 + * + * @author Lion Li + * @date 2025-12-04 + */ +@RequiredArgsConstructor +@Service +public class HseRpObjectServiceImpl extends ServiceImpl implements IHseRpObjectService { + + private final HseRpObjectMapper baseMapper; + + /** + * 查询奖惩对象 + * + * @param id 主键 + * @return 奖惩对象 + */ + @Override + public HseRpPersonVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询奖惩对象列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 奖惩对象分页列表 + */ + @Override + public TableDataInfo queryPageList(HseRpObjectBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的奖惩对象列表 + * + * @param bo 查询条件 + * @return 奖惩对象列表 + */ + @Override + public List queryList(HseRpObjectBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseRpObjectBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseRpObject::getId); + lqw.eq(bo.getRpId() != null, HseRpObject::getRpId, bo.getRpId()); + lqw.eq(bo.getObjectId() != null, HseRpObject::getObjectId, bo.getObjectId()); + lqw.like(StringUtils.isNotBlank(bo.getObjectName()), HseRpObject::getObjectName, bo.getObjectName()); + lqw.eq(bo.getAmount() != null, HseRpObject::getAmount, bo.getAmount()); + return lqw; + } + + /** + * 新增奖惩对象 + * + * @param bo 奖惩对象 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseRpObjectBo bo) { + HseRpObject add = MapstructUtils.convert(bo, HseRpObject.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改奖惩对象 + * + * @param bo 奖惩对象 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseRpObjectBo bo) { + HseRpObject update = MapstructUtils.convert(bo, HseRpObject.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseRpObject entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除奖惩对象信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java index faad7f7c..685ead06 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java @@ -498,4 +498,13 @@ public class HseViolationRecordServiceImpl extends ServiceImpl selectLatestList(HseViolationRecordQueryReq req) { +// LambdaQueryWrapper lqw = this.buildQueryWrapper(req); +// lqw.isNotNull(HseViolationRecord::getJobKey); +// lqw.isNotNull(HseViolationRecord::get); +// baseMapper.selectLatestList(req); +// } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRewardsPunishmentsMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRewardsPunishmentsMapper.xml new file mode 100644 index 00000000..4c0cd5ce --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRewardsPunishmentsMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRpObjectMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRpObjectMapper.xml new file mode 100644 index 00000000..b1cbab21 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseRpObjectMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationRecordMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationRecordMapper.xml index d9fa99b3..ef8609b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationRecordMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationRecordMapper.xml @@ -18,4 +18,19 @@ ${ew.getCustomSqlSegment} + +