临时提交

16639036659

2024-03-14 a496d036e6a17332ec89e309c08735605491b06f

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

@@ -323,6 +323,7 @@
            //写入上报昌吉州转换表

            for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {

                CJMeasureService.insertMeasureList(CJMeasure);



                logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");

            }

        }else {

@@ -460,7 +461,7 @@
                    //获取任务附属表信息

                    PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());

                    //转换检查结果

                    //如果已经执行过，进入方法

                    //如果已经执行过，进入方法 todo

                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){



                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());

@@ -602,12 +603,12 @@


                    //通过用户名，获取涉及到的各位用户的真实姓名

                    User createUser = new User();

                    createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());  //todo

                    createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());

//                    createUser = trUserService.getUserByLoginName("guotai");

                    if(ObjectUtils.isEmpty(createUser)){

                        createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());

                    }

                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy()); //todo

                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

//                    User updateUser = trUserService.getUserByLoginName("guotai");

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){

                        User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());

@@ -632,26 +633,27 @@
                    }



                    //如果排查任务正常存在，封装任务相关数据

                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){

                        HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());



                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());

                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid

                        //找排查点，然后查措施

                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());

                        //查管控措施

                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());

                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid

                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施

                    }else {

                        CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid

                        CJDangerInfo.setRiskMeasureId(null);//管控措施uuid

                    }



//                    if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){

//                        HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());

//

//                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());

//                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid

//                        //找排查点，然后查措施

//                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());

//                        //查管控措施

//                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());

//                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid

//                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施

//                    }else {

//                        CJDangerInfo.setCheckRecordId(null);

//                        CJDangerInfo.setRiskMeasureId(null);

//                    }

                    CJDangerInfo.setCheckRecordId(null);

                    CJDangerInfo.setRiskMeasureId(null);//默认无任务

                    CJDangerInfo.setDeleted("0");

                    CJDangerInfo.setId(dangerManage.getUuid());

                    CJDangerInfo.setCompanyCode(companyCode);

                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码

                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());

                    CJDangerInfo.setCreateBy(createUser.getUserName());

                    CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());



@@ -672,22 +674,22 @@
                    CJDangerInfo.setReportTime(null);

                    CJDangerInfo.setDataSource((byte) 1);

                    CJDangerInfo.setDangerName(hiddenDanger.getDangerName());

                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级

                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源

                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());

                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());

                    if (hiddenDanger.getRectifyType().equals("1")){

                        CJDangerInfo.setDangerManageType("0");//隐患治理类型

                        CJDangerInfo.setDangerManageType("0");

                    }else {

                        CJDangerInfo.setDangerManageType("1");//隐患治理类型

                        CJDangerInfo.setDangerManageType("1");

                    }

                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述

                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因

                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限

                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());

                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());

                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());

                    if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){

                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态

                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());

                    }

                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());// todo 隐患类型

                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());

                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

                    //封装数据



                    CJDangerInfoLists.add(CJDangerInfo);

                    //设置原始数据上报状态

                    handlerReportParam.setId(dangerManage.getId());