blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2024-10-17 d5d652d23a0bdf64ce527a6b592713a849abac7d 
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java


@@ -40,7 +40,6 @@


    public void screenHome() {


        JSONObject jsonObject = new JSONObject();


        Reportingdamage reportingdamage = new Reportingdamage();


        //reportingdamage.setReportingWorkTime("2024-05-11");


        // 获取当前日期


        LocalDate today = LocalDate.now();


        // 计算最近七天的开始日期


@@ -52,8 +51,9 @@


        String startOfPeriodStr = startOfPeriod.format(formatter);


        String endOfPeriodStr = endOfPeriod.format(formatter);


        // 设置为最近七天的时间范围


        reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr);


        //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);


//        reportingdamage.setReportingWorkTime("2024-05-11");


        reportingdamage.setReportingWorkTime(startOfPeriodStr);


        reportingdamage.setReportingWorkTime2(endOfPeriodStr);


        //扇形图各设备的加工破损数量


        List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);


        jsonObject.append("device", device);