检查点查询添加管控措施ID

16639036659

2022-10-31 a72ac436263a8f41dd85635153dfdf204ae6eaa0

 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);
    }

    /**