| | |
| | | package cn.iocoder.yudao.module.mes.service.safety; |
| | | |
| | | import cn.hutool.core.collection.CollUtil; |
| | | import cn.hutool.core.util.StrUtil; |
| | | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| | | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| | |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.time.format.DateTimeFormatter; |
| | | import java.util.List; |
| | | |
| | | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| | | import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*; |
| | |
| | | |
| | | @Resource |
| | | private SafetyHazardMapper hazardMapper; |
| | | @Resource |
| | | private SafetyRefResolver refResolver; |
| | | |
| | | /** |
| | | * 隐患上报(含移动端拍照上传的 photoUrls) |
| | |
| | | SafetyHazardDO hazard = BeanUtils.toBean(reqVO, SafetyHazardDO.class); |
| | | hazard.setCode(hazardMapper.selectNextCode("HZ" + LocalDate.now().format(CODE_DATE))); |
| | | hazard.setTitle(StrUtil.trim(reqVO.getTitle())); |
| | | hazard.setReporter(StrUtil.trim(reqVO.getReporter())); |
| | | hazard.setReporterId(reqVO.getReporterId()); |
| | | hazard.setReporter(refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName()); |
| | | hazard.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyHazardLevelEnum.GENERAL.getLevel())); |
| | | hazard.setSource(StrUtil.blankToDefault(reqVO.getSource(), SafetyHazardSourceEnum.SELF_CHECK.getSource())); |
| | | hazard.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime()); |
| | |
| | | && !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) { |
| | | throw exception(SAFETY_HAZARD_STATUS_ERROR); |
| | | } |
| | | if (StrUtil.isBlank(reqVO.getAssignee())) { |
| | | if (reqVO.getAssigneeId() == null) { |
| | | throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED); |
| | | } |
| | | var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED); |
| | | SafetyHazardDO update = new SafetyHazardDO(); |
| | | update.setId(hazard.getId()); |
| | | update.setAssignee(StrUtil.trim(reqVO.getAssignee())); |
| | | update.setAssigneeId(assignee.getId()); |
| | | update.setAssignee(assignee.getName()); |
| | | update.setAssignTime(LocalDateTime.now()); |
| | | update.setRectifyDeadline(reqVO.getRectifyDeadline()); |
| | | update.setStatus(SafetyHazardStatusEnum.RECTIFYING.getStatus()); |
| | |
| | | if (!SafetyHazardStatusEnum.RECHECKING.getStatus().equals(hazard.getStatus())) { |
| | | throw exception(SAFETY_HAZARD_STATUS_ERROR); |
| | | } |
| | | String rechecker = StrUtil.trim(reqVO.getRechecker()); |
| | | if (StrUtil.isNotBlank(hazard.getAssignee()) && hazard.getAssignee().equals(rechecker)) { |
| | | var rechecker = refResolver.requireEmployee(reqVO.getRecheckerId(), SAFETY_EMPLOYEE_REQUIRED); |
| | | // 用员工编号比较,比姓名比较可靠(同名不同人 / 改名都不会误判) |
| | | if (hazard.getAssigneeId() != null && hazard.getAssigneeId().equals(rechecker.getId())) { |
| | | throw exception(SAFETY_HAZARD_SAME_OPERATOR); |
| | | } |
| | | boolean passed = "PASSED".equals(reqVO.getRecheckResult()); |
| | | SafetyHazardDO update = new SafetyHazardDO(); |
| | | update.setId(hazard.getId()); |
| | | update.setRechecker(rechecker); |
| | | update.setRecheckerId(rechecker.getId()); |
| | | update.setRechecker(rechecker.getName()); |
| | | update.setRecheckTime(LocalDateTime.now()); |
| | | update.setRecheckResult(reqVO.getRecheckResult()); |
| | | update.setRecheckRemark(reqVO.getRecheckRemark()); |
| | |
| | | } |
| | | |
| | | /** |
| | | * 批量回填上报人 / 整改责任人 / 复查人的最新姓名 |
| | | */ |
| | | public void fillPersonNames(List<SafetyHazardDO> hazards) { |
| | | if (CollUtil.isEmpty(hazards)) { |
| | | return; |
| | | } |
| | | var ids = new java.util.ArrayList<Long>(hazards.size() * 3); |
| | | hazards.forEach(h -> { ids.add(h.getReporterId()); ids.add(h.getAssigneeId()); ids.add(h.getRecheckerId()); }); |
| | | var employeeMap = refResolver.employeeMap(ids); |
| | | hazards.forEach(hazard -> { |
| | | var reporter = employeeMap.get(hazard.getReporterId()); |
| | | if (reporter != null) hazard.setReporter(reporter.getName()); |
| | | var assignee = employeeMap.get(hazard.getAssigneeId()); |
| | | if (assignee != null) hazard.setAssignee(assignee.getName()); |
| | | var rechecker = employeeMap.get(hazard.getRecheckerId()); |
| | | if (rechecker != null) hazard.setRechecker(rechecker.getName()); |
| | | }); |
| | | } |
| | | |
| | | /** |
| | | * 展示字段补全(等级/来源/状态名称、超期标记) |
| | | */ |
| | | public static void fillHazardDisplay(SafetyHazardDO hazard, SafetyHazardRespVO respVO) { |