Merge remote-tracking branch 'origin/master'

马宇豪

2024-06-19 6d8304c25e9b732172de6f1597075612aa2950de

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

@@ -5,15 +5,13 @@
import com.ruoyi.doublePrevention.enums.ErrorCodes;

import com.ruoyi.doublePrevention.enums.ResultCodes;

import com.ruoyi.doublePrevention.vo.ResultVO;

import com.ruoyi.project.tr.specialCheck.domin.*;

import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;

import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;

import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;

import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;

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.TbSpecialCheckTaskLog;

import com.ruoyi.project.tr.specialCheck.mapper.*;

import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;

import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

@@ -33,6 +31,8 @@
    private TbBaseCheckTaskMapper taskTbRepository;

    @Autowired

    private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;

    @Autowired

    private SpecialCheckItemDangerLogService itemDangerLogService;



    @Override

    public ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO) {

@@ -93,8 +93,10 @@
        if (pageIndex == 0 || pageSize == 0){

            return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");

        }



        TbSpecialCheckItemLog specialCheckItemDangerLogById = itemDangerLogService.getSpecialCheckItemDangerLogById(tbBaseCheckScoreBO.getId());

        Page<TbBaseCheckScore> page = PageHelper.startPage(pageIndex, pageSize);



        tbBaseCheckScoreBO.setCheckItemId(specialCheckItemDangerLogById.getCheckItemId());

        scoreTbRepository.selectTbBaseCheckScorePage(tbBaseCheckScoreBO);



        Long total = page.getTotal();

@@ -111,7 +113,10 @@
        return resultVO;

    }





    @Override

    public List<TbBaseCheckTask> listTbBaseCheckTask() {

        return taskTbRepository.listTbBaseCheckTask();

    }





}