Merge remote-tracking branch 'origin/master'

16639036659

2024-07-17 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java

@@ -150,15 +150,16 @@
            resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());

            return resultVO;

        }

        HandlerSpecialCheckReportParam specialCheckItemLog = new HandlerSpecialCheckReportParam();

        specialCheckItemLog.setReportStatus((byte) 2);

        specialCheckItemLog.setReportTime(dateTime);

        int i = specialCheckItemLogMapper.updateItemDangerReportStatusById(specialCheckItemLog);

        if (i == 0){

            resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());

            resultVO.setMsg("修改检查项状态失败");

            return resultVO;

        }

//        HandlerSpecialCheckReportParam specialCheckItemLog = new HandlerSpecialCheckReportParam();

//        specialCheckItemLog.setId();

//        specialCheckItemLog.setReportStatus((byte) 2);

//        specialCheckItemLog.setReportTime(dateTime);

//        int i = specialCheckItemLogMapper.updateItemDangerReportStatusById(specialCheckItemLog);

//        if (i == 0){

//            resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());

//            resultVO.setMsg("修改检查项状态失败");

//            return resultVO;

//        }

        resultVO.setCode(ResultCodes.OK.getCode());

        resultVO.setMsg("新增检查成功");

        return resultVO;