src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
@@ -109,7 +109,7 @@ */ @PostMapping("/add") @ResponseBody public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog){ public AjaxResult addSpecialItemDanger(@RequestBody TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog){ ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerEditLog); String code = resultVO.getCode(); src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
@@ -12,5 +12,5 @@ List<TbBaseCheckTaskMapper> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO); TbBaseCheckTaskMapper getBaseCheckTaskByTaskId(String taskId); TbBaseCheckTask getBaseCheckTaskByTaskId(String taskId); } src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -80,7 +80,7 @@ resultVO.setMsg("任务不能为空"); return resultVO; } TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId()); TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId()); if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){ resultVO.setMsg("任务不存在"); return resultVO; @@ -149,7 +149,7 @@ resultVO.setMsg("专项任务不能为空"); return resultVO; } TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId()); TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId()); if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){ resultVO.setMsg("专项任务不存在"); return resultVO; src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
@@ -13,6 +13,7 @@ import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO; import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem; import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore; import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog; import com.ruoyi.project.tr.specialCheck.mapper.*; import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService; @@ -106,7 +107,7 @@ resultVO.setMsg("隐患不存在"); return resultVO; } if (scoreAndDangerLog.getCheckDate() == null){ if (scoreAndDangerEditLog.getCheckDate() == null){ resultVO.setMsg("检查时间不能为空"); return resultVO; } @@ -114,7 +115,7 @@ resultVO.setMsg("检查类型不能为空"); return resultVO; } TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId()); TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId()); if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){ resultVO.setMsg("专项任务不存在"); return resultVO; @@ -136,6 +137,7 @@ scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject()); scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint()); scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate()); scoreAndDangerLog.setTaskId(baseCheckItemByItemId.getTaskId()); scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault())); @@ -192,7 +194,7 @@ resultVO.setMsg("隐患不存在"); return resultVO; } if (scoreAndDangerLog.getCheckDate() == null){ if (scoreAndDangerEditLog.getCheckDate() == null){ resultVO.setMsg("检查时间不能为空"); return resultVO; } @@ -200,7 +202,7 @@ resultVO.setMsg("检查类型不能为空"); return resultVO; } TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId()); TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId()); if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){ resultVO.setMsg("专项任务不存在"); return resultVO; src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
@@ -35,7 +35,7 @@ order by create_date desc </where> </select> <!-- TbBaseCheckTaskMapper getBaseCheckTaskByTaskId(String taskId);--> <!-- TbBaseCheckTask getBaseCheckTaskByTaskId(String taskId);--> <select id="getBaseCheckTaskByTaskId" resultMap="BaseResultMap"> select * from tb_base_check_task where id = #{taskId} src/main/resources/mybatis/tr/TbSpecialCheckScoreAndDangerLogMapper.xml
@@ -154,9 +154,6 @@ <if test="checkDate != null"> check_date = #{checkDate}, </if> <if test="resultStatus != null"> result_status = #{resultStatus}, </if> <if test="reportStatus != null"> report_status = #{reportStatus}, </if>
