src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java
@@ -13,8 +13,10 @@ import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO; import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemDangerLogDTO; import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemLogDTO; import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog; import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService; import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService; import org.springframework.beans.factory.annotation.Autowired; @@ -71,8 +73,21 @@ { ResultVO<List<TbSpecialCheckItemLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO); List<TbSpecialCheckItemDangerLog> itemList = (List<TbSpecialCheckItemDangerLog>) resultVO.getData(); List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData(); List<TbSpecialCheckItemLogDTO> tbSpecialCheckItemLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckItemLogDTO.class); for (TbSpecialCheckItemLogDTO item : tbSpecialCheckItemLogDTOS) { for (TbSpecialCheckItemDangerLog datum : itemList) { if (datum.getId().equals(item.getId())){ Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant(); item.setCreateDate(Date.from(createDate)); Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant(); item.setUpdateDate(Date.from(updateDate)); } } } TableDataInfo dataTable = getDataTable(data); dataTable.setTotal(resultVO.getCount()); src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
@@ -66,8 +66,24 @@ { ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO); List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData(); List<TbSpecialCheckScoreAndDangerLog> scoreList = (List<TbSpecialCheckScoreAndDangerLog>) resultVO.getData(); List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class); for (TbSpecialCheckScoreAndDangerLogDTO score : tbSpecialCheckScoreAndDangerLogDTOS) { for (TbSpecialCheckScoreAndDangerLog datum : scoreList) { if (datum.getId().equals(score.getId())){ Instant checkDate = datum.getCheckDate().atZone(ZoneId.systemDefault()).toInstant(); score.setCheckDate(Date.from(checkDate)); Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant(); score.setCreateDate(Date.from(createDate)); Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant(); score.setUpdateDate(Date.from(updateDate)); } } } TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS); dataTable.setTotal(resultVO.getCount()); src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -128,7 +128,7 @@ } /** * 事故信息详情 * */ @GetMapping("/detail/{indexId}") public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap) src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -13,6 +13,7 @@ import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO; import com.ruoyi.project.tr.specialCheck.mapper.*; import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService; import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -41,7 +42,8 @@ @Autowired private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository; @Autowired private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService; @Override public ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) { @@ -139,13 +141,17 @@ ResultVO resultVO = new ResultVO<>(); resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode()); if (updateBO.getTaskId() == null){ if (updateBO.getIndexId() == null){ resultVO.setMsg("任务不能为空"); return resultVO; } if (updateBO.getTaskId() == null){ resultVO.setMsg("专项任务不能为空"); return resultVO; } TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId()); if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){ resultVO.setMsg("任务不存在"); resultVO.setMsg("专项任务不存在"); return resultVO; } if (updateBO.getCheckItemId() == null){ @@ -200,7 +206,11 @@ resultVO.setMsg("检查项不存在，删除失败"); return resultVO; } TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId()); if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){ resultVO.setMsg("该检查项存在评价记录，无法删除"); return resultVO; } TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog(); LocalDateTime dateTime = LocalDateTime.now();
