16639036659
2023-07-06 01709e5c45ef32e669fd07572a018dcfe6fc9fce
临时提交-包保责任人标志
已修改1个文件
17 ■■■■■ 文件已修改
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -356,11 +356,8 @@
                    if (jobById.getTroubleshootTypeCycleType() == 1){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("小时");
                        CJTaskFromWork.setWorkStartTime(jobById.getCreateTime());
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(jobById.getCreateTime());
                        calendar.add(Calendar.HOUR, Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setWorkEndTime(calendar.getTime());
                        CJTaskFromWork.setWorkStartTime("00:00:00");
                        CJTaskFromWork.setWorkEndTime("23:59:59");
                    }else if (jobById.getTroubleshootTypeCycleType() == 2){
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
                        CJTaskFromWork.setCheckCycleUnit("天");
@@ -406,19 +403,17 @@
                    PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
                    if (jobById.getTroubleshootTypeCycleType() == 1){
                        Date date = new Date();
                        CJTaskFromWork.setWorkStartTime(new Date(startFormat.format(date)));//todo  这个时间如何确定?
                        CJTaskFromWork.setWorkEndTime(new Date(endFormat.format(date)));
                    }
                    CJTaskFromWork.setWorkDayType("0");
                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
                    int typeTag = 0;
                    for (PreventTaskType taskType : typeByJobId) {
                        typeTag = taskType.getType();
                    }
                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));
                    if (typeTag !=0){
                    CJTaskFromWork.setTaskNum("1");
                    }
                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));
                    //封装数据
                    CJTaskFromWorkLists.add(CJTaskFromWork);