Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 be8a6f171bd41aa50fb7310b2ccbe753dac20b89

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

@@ -164,6 +164,10 @@
            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);

            List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id);
            record.put("operationUserDetails", operationUserDetails);
            List<Map<String, Object>> repairUserDetails = dailyMaintenanceOrderService.getRepairUser(id);
            record.put("repairUserDetails", repairUserDetails);
            //统计工时定额
//            BigDecimal workingHourQuota = new BigDecimal(0);
//            for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
@@ -203,16 +207,20 @@
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                String operateUser = finishTransferOrder.getOperateUser();
//                record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
//                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser));
                String repairUser = finishTransferOrder.getRepairUser();
//                record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
//                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser));
                String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
//                record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
//                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser));
                String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
//                record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
//                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser));
            }

        }
@@ -230,7 +238,7 @@
        List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
//            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);
@@ -298,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设备检验员（盖章））
@@ -373,7 +382,9 @@
         * 若果原标准原周期发生变化，删除原工单明细 重新维护
         */
        if (!oldMaintenanceStandardId.equals(maintenanceStandardId) || !oldMaintenanceCycleId.equals(maintenanceCycleId)) {
            List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService.lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId).eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
            List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService
                    .lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId)
                    .eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
            for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
                dailyMaintenanceOrderDetailService.removeById(dailyMaintenanceOrderDetail);
            }
@@ -654,6 +665,7 @@

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

@@ -665,6 +677,11 @@
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        String equipmentId = maintenanceOrder.getEquipmentId();
        Equipment equipment = equipmentService.getById(equipmentId);
        equipment.setSecondMaintenanceTime(new Date());
        equipmentService.updateById(equipment);

        if (!b) {
            return Result.error("报工失败!");
@@ -685,6 +702,7 @@

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

@@ -709,6 +727,20 @@
        this.createPrecisionInspection(maintenanceOrder);

        this.createMaintenanceStoveExempt(maintenanceOrder);

        /**
         * 三保报工时  更新本次三保日期  和下次三保日期
         */
        String equipmentImportanceId = equipment.getEquipmentImportanceId();
        equipment.setThirdMaintenanceTime(new Date());
        if("A".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),3));
        }else if("B".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
        }else if("C".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
        }
        equipmentService.updateById(equipment);

        if (!b) {
            return Result.error("报工失败!");
@@ -778,10 +810,12 @@
        String orderId = dailyMaintenanceOrder.getId();
        String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
        String confirmStatus = dailyMaintenanceOrder.getConfirmStatus();
        Date maintenanceDate = dailyMaintenanceOrder.getMaintenanceDate();

        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
        String equipmentId = maintenanceOrder.getEquipmentId();
        String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
        maintenanceOrder.setMaintenanceDate(maintenanceDate);
        if(StringUtils.isBlank(orderUda3)){
            maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
        }