Merge remote-tracking branch 'origin/master'

16639036659

2024-07-17 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d

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

@@ -32,6 +32,11 @@
    public PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId) {

        return preventRiskJobAndMeasureRepository.getJobAndMeasureByJobId(jobId);

    }



    @Override

    public List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId) {

        return preventRiskJobAndMeasureRepository.getJobAndMeasureListByJobId(jobId);

    }

    /**

     * 删除job管控措施的附属表关联信息

     */

@@ -73,5 +78,10 @@
        return preventRiskJobAndMeasureRepository.listReportWorkTest();

    }



    @Override

    public List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId) {

        return preventRiskJobAndMeasureRepository.getRectifyJobData(jobId);

    }





}