src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java

@@ -87,7 +87,7 @@




    @Transactional

    @Scheduled(cron = "0 0/1 * * * ?")

//    @Scheduled(cron = "0 0/1 * * * ?")

    //@Scheduled(cron = "0/30 * * * * ?")

    public void execReportDateSchedule() throws UnsupportedEncodingException {

        logger.info("【####】上报数据开始...");


 src/main/java/com/ruoyi/doublePrevention/service/RiskService.java

@@ -1,5 +1,6 @@
package com.ruoyi.doublePrevention.service;



import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;

import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;

import com.ruoyi.doublePrevention.entity.PreventRiskEvent;

import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;

@@ -167,4 +168,8 @@
     * 管控措施-不分页查询

     */

    ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();

    /**

     * 通过排查点，查找管控措施id

     */

    PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java

@@ -27,4 +27,5 @@
     * 通过baseCheckPointId 查询管控措施列表

     */

    PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);



}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java

@@ -42,4 +42,5 @@
    public PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId) {

        return preventRiskCheckUnitRepository.getUnitByBaseCheckPointId(baseCheckPointId);

    }



}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java

@@ -1,11 +1,8 @@
package com.ruoyi.doublePrevention.service.baseService.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.enums.E;
import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.exception.AusinessException;
import com.ruoyi.doublePrevention.repository.PreventRiskControlMeasureRepository;
import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

 src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java

@@ -1298,8 +1298,15 @@
        ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);

        return resultVO;

    }

    /**

     * 通过排查点，查找管控措施id

     */

    @Override

    public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {

        return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);

    }



//    /**

    //    /**

//     * 全流程隐患上报-附属表信息插入

//     * */

//    @Override


 src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java

@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
@@ -81,7 +82,16 @@
    {
        startPage();
        List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointList(baseCheckPoint);
        return getDataTable(list);
        List<BaseCheckPoint> resultList = new ArrayList<>();

        //todo-2022 ，此处改造，查询措施相关信息
        for (BaseCheckPoint checkPoint : list) {
            PreventRiskCheckUnit measureByCheckPointId = riskService.getRiskControlMeasureByCheckPointId(checkPoint.getCheckPointId());
            checkPoint.setControlMeasureId(measureByCheckPointId.getControlMeasureId());
            resultList.add(checkPoint);
        }

        return getDataTable(resultList);
    }

    /**