增加下次三保时间 技术状态类型及单号

qushaowei

2023-10-29 2c250bb7d2c0efd16e5f124648bc77f5fd93040a

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

@@ -92,6 +92,21 @@
    @Autowired
    private ISysUserService sysUserService;

    @Autowired
    private IPrecisionInspectionService precisionInspectionService;

    @Autowired
    private IEamEquipmentService equipmentService;

    @Autowired
    private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;

    @Autowired
    private IPrecisionInspectionDetailService precisionInspectionDetailService;

    @Autowired
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;


    /**
     * 分页列表查询
@@ -113,7 +128,7 @@
    }

    /**
     * 日常保养工单
     * 二级保养工单
     * qsw 2023-4-14
     */
    @GetMapping("getDailyMaintenanceOrderList")
@@ -192,6 +207,71 @@
        return Result.ok(dailyMaintenanceOrderList);
    }


    /**
     * 三级保养工单
     * qsw 2023-4-14
     */
    @GetMapping("getDailyMaintenanceOrder3List")
    public Result<?> getDailyMaintenanceOrder3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrderList(pageNo, pageSize, params);
        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 maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            //统计工时定额
            BigDecimal workingHourQuota = new BigDecimal(0);
            for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
                if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
                    Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
                    BigDecimal workingHour = new BigDecimal(wh);
                    workingHourQuota = workingHourQuota.add(workingHour);
                }
            }
            record.put("workingHourQuota",workingHourQuota);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
            /**
             * 复选框 不可编辑
             */
           /* String status = (String) record.get("status");
            if ("5".equals(status)) {
                record.put("distable", false);
            } else {
                record.put("distable", true);
            }*/
            /**
             * 统计实际工时
             */
            QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
            actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
            actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
            Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
            BigDecimal actualQuantity = new BigDecimal(0);
            if (map != null) {
                actualQuantity = (BigDecimal) map.get("actualQuantity");
            }
            record.put("actualWorkingHourQuota", actualQuantity);

            /**
             *获取是否为炉类设备标记
             */
            String equipmentCategoryName = (String) record.get("equipmentCategoryName");
            if("炉类设备".equals(equipmentCategoryName)){
                record.put("isNotStoveCategoryFlag", true);
            }else{
                record.put("isNotStoveCategoryFlag", false);
            }

        }
        return Result.ok(dailyMaintenanceOrderList);
    }


    /**
     * 添加
     *
@@ -219,6 +299,8 @@
        dailyMaintenanceOrder.setPlanEndTime(date);//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setCreateType("1");//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））
        dailyMaintenanceOrder.setStoveExemptStatus("0");//炉类设备豁免20项状态（0未确认，1维修室主任，2保养人员，3仪表工）
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -442,9 +524,78 @@

            List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
                    .eq(FinishTransferOrder::getMaintenanceOrderId, id)
                    .eq(FinishTransferOrder::getDelFlag,0)
                    .eq(FinishTransferOrder::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                finishTransferOrderService.removeById(finishTransferOrder);
            }

//            /**
//             * 删除精度管理表
//             */
//            List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
//                    .eq(PrecisionInspection::getMaintenanceOrderId, id)
//                    .eq(PrecisionInspection::getDelFlag,0)
//                    .eq(PrecisionInspection::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
//            for (PrecisionInspection precisionInspection : precisionInspectionList) {
//                List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
//                        .eq(PrecisionInspectionDetail::getPrecisionInspectionId, precisionInspection.getId())
//                        .eq(PrecisionInspectionDetail::getDelFlag,0)
//                        .list();
//                for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
//                    precisionInspectionDetailService.removeById(precisionInspectionDetail);
//                }
//                precisionInspectionService.removeById(precisionInspection);
//            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
                return Result.error("撤销失败!");
            }
        } else {
            return Result.error("仅限已完工状态撤销完成操作!");
        }
    }



    @RequestMapping(value = "/revocation3M", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> revocation3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        String status = maintenanceOrder.getStatus();
        if ("5".equals(status)) {
            maintenanceOrder.setActualEndTime(null);
            boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

            /**
             * 删除精度检验表
             */
            List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
                    .eq(PrecisionInspection::getMaintenanceOrderId, id)
                    .eq(PrecisionInspection::getDelFlag,0)
                    .eq(PrecisionInspection::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
            for (PrecisionInspection precisionInspection : precisionInspectionList) {
                List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
                        .eq(PrecisionInspectionDetail::getPrecisionInspectionId, precisionInspection.getId())
                        .eq(PrecisionInspectionDetail::getDelFlag,0)
                        .list();
                for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
                    precisionInspectionDetailService.removeById(precisionInspectionDetail);
                }
                precisionInspectionService.removeById(precisionInspection);
            }

            /**
             * 删除炉类检测
             */
            List<MaintenanceStoveExempt> maintenanceStoveExempts = maintenanceStoveExemptService.lambdaQuery()
                    .eq(MaintenanceStoveExempt::getMaintenanceOrderId, id)
                    .eq(MaintenanceStoveExempt::getDelFlag, 0).list();
            for (MaintenanceStoveExempt maintenanceStoveExempt : maintenanceStoveExempts) {
                maintenanceStoveExemptService.removeById(maintenanceStoveExempt);
            }

            if (b) {
@@ -456,6 +607,7 @@
            return Result.error("仅限已完工状态撤销完成操作!");
        }
    }


    /**
     *  保养工单派工、改派
@@ -488,11 +640,77 @@
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

//        this.createPrecisionInspection(maintenanceOrder);
//
//        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
        } else {
            return Result.ok("报工成功!");
        }
    }


    @RequestMapping(value = "/report3M", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
        finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
        finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
        finishTransferOrder.setOperateUser(userId);
        finishTransferOrder.setRepairUser(userId);
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        this.createPrecisionInspection(maintenanceOrder);

        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
        } else {
            return Result.ok("报工成功!");
        }
    }

    void createPrecisionInspection(DailyMaintenanceOrder dailyMaintenanceOrder){
        PrecisionInspection precisionInspection = new PrecisionInspection();
        precisionInspection.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
        precisionInspection.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
        precisionInspectionService.save(precisionInspection);

        List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipmentPrecisionParametersService.lambdaQuery()
                .eq(EquipmentPrecisionParameters::getEquipmentId, dailyMaintenanceOrder.getEquipmentId())
                .eq(EquipmentPrecisionParameters::getDelFlag, "0").list();
        PrecisionInspectionDetail precisionInspectionDetail = null;
        for (EquipmentPrecisionParameters equipmentPrecisionParameter : equipmentPrecisionParameters) {
            precisionInspectionDetail = new PrecisionInspectionDetail();
            precisionInspectionDetail.setPrecisionInspectionId(precisionInspection.getId());
            precisionInspectionDetail.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
            precisionInspectionDetail.setPrecisionParametersId(equipmentPrecisionParameter.getPrecisionParametersId());

            String upperLimit = equipmentPrecisionParameter.getUpperLimit()+"";
            String lowerLimit = equipmentPrecisionParameter.getLowerLimit()+"";
            precisionInspectionDetail.setTolerance("["+upperLimit+"—"+lowerLimit+"]");
            precisionInspectionDetailService.save(precisionInspectionDetail);
        }
    }


    void createMaintenanceStoveExempt(DailyMaintenanceOrder dailyMaintenanceOrder){
        MaintenanceStoveExempt maintenanceStoveExempt = new MaintenanceStoveExempt();
        maintenanceStoveExempt.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
    }

    /**
@@ -509,6 +727,7 @@
     * 审批
     */
    @RequestMapping(value = "/approve", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> approve(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
@@ -542,4 +761,16 @@
        return Result.OK("审批成功!");
    }

    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
        equipment.setTechnologyStatusVerificationType("1");
        equipmentService.updateById(equipment);

        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(equipment.getMaintenanceOrderId());
        dailyMaintenanceOrder.setStatus("8");
        dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
        return Result.OK("编辑成功!");
    }

}