Merge remote-tracking branch 'origin/master'

16639036659

2024-07-17 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d

 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java

@@ -17,6 +17,8 @@
     * 查询JobAndMeasure - By JobId

     */

    PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);



    List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);

    /**

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

     */

@@ -36,4 +38,8 @@
     * 修改上报状态

     */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);



    List<PreventRiskJobAndMeasure> listReportWorkTest();



    List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);

}