暂时提交

16639036659

2023-12-11 56c84cd7fb04407536eb0135162313029828a81f

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

@@ -109,7 +109,7 @@
    @Transactional

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

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

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

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

    public void searchReportDate(){



        logger.info("【双重预防】定时检索需要上报数据...");

@@ -168,6 +168,7 @@
                        CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());

                        CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());

                    }



                    CJReportRiskAnaUnit.setDataSource((byte) 1);

                    CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                    CJReportRiskAnaUnit.setReportTime(null);

@@ -305,6 +306,7 @@
                    CJReportMeasure.setRiskMeasureId(measure.getId());

                    CJReportMeasure.setTroubleshootContent(measure.getCheckContent());





                    //封装数据

                    CJMeasureLists.add(CJReportMeasure);

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

@@ -403,6 +405,13 @@
                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());



                    CJTaskFromWork.setWorkDayType("0");

                    CJTaskFromWork.setWorkStartTime("00:00:01");

                    CJTaskFromWork.setWorkEndTime("23:59:59");

                    CJTaskFromWork.setWorkType(measureById.getWorkType());

                    if (ObjectUtils.isNotEmpty(measureById.getTaskNum())){

                        CJTaskFromWork.setTaskNum(measureById.getTaskNum());

                    }



                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());

                    int typeTag = 0;

                    for (PreventTaskType taskType : typeByJobId) {

@@ -615,10 +624,12 @@
                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间

                    }



                    CJDangerInfo.setCost(String.valueOf(0));//初始值给0

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

                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());

                        //整改人信息

                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人

                        CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

                    }



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

@@ -678,12 +689,11 @@
                    }

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

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

                    CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

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

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

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

                    }

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

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

                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

                    //封装数据

                    CJDangerInfoLists.add(CJDangerInfo);