Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 be8a6f171bd41aa50fb7310b2ccbe753dac20b89

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java

@@ -158,8 +158,8 @@
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
//            record.put("maintenanceCycles", maintenanceCycles);
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
@@ -239,9 +239,9 @@
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
//            String equipmentId = (String) record.get("equipmentId");
//            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
//            record.put("maintenanceCycles", maintenanceCycles);
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            //统计工时定额
@@ -306,17 +306,18 @@
        Date planStartTime = dailyMaintenanceOrder.getPlanStartTime();
        String maintenanceCycleId = dailyMaintenanceOrder.getMaintenanceCycleId();
        MaintenanceCycle maintenanceCycle = maintenanceCycleService.getById(maintenanceCycleId);
        String unit = maintenanceCycle.getUnit();
        int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
        Date date = null;
        if ("min".equals(unit)) {
            date = DateUtils.getMinAfter(planStartTime, effectiveTime);
        } else if ("hour".equals(unit)) {
            date = DateUtils.getHourAfter(planStartTime, effectiveTime);
        } else if ("day".equals(unit)) {
            date = DateUtils.getDayAfter(planStartTime, effectiveTime);
        }
        dailyMaintenanceOrder.setPlanEndTime(date);//创建类型（1手动创建，2自动创建）
//        String unit = maintenanceCycle.getUnit();
//        int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
//        Date date = null;
//        if ("min".equals(unit)) {
//            date = DateUtils.getMinAfter(planStartTime, effectiveTime);
//        } else if ("hour".equals(unit)) {
//            date = DateUtils.getHourAfter(planStartTime, effectiveTime);
//        } else if ("day".equals(unit)) {
//            date = DateUtils.getDayAfter(planStartTime, effectiveTime);
//        }
//        dailyMaintenanceOrder.setPlanEndTime(date);//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setPlanEndTime(null);//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setCreateType("1");//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））