鉴定工单调整

zenglf

2023-10-25 f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70

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

@@ -452,44 +452,44 @@
        QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap());
        Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize);
        IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper);
        for (CalibrationOrder record : pageList.getRecords()) {
            String id = record.getId();
            String status = record.getStatus();
            String managementMode = record.getManagementMode();
            String equipmentId = record.getEquipmentId();
            Equipment equipment = equipmentService.getById(equipmentId);
            if(equipment != null){
                record.setEquipmentNum(equipment.getNum());
                record.setEquipmentName(equipment.getName());
                record.setEquipmentModel(equipment.getModel());
                record.setEquipmentSpecification(equipment.getSpecification());
            }
            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
            record.setPrecisionParameterList(precisionParameterList);
            if("4".equals(status)){
                if("data".equals(managementMode)){
                    List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
                            .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
                            .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
                            .eq(CalibrationOrderDetail::getDelFlag,"0").list();
                    if(calibrationOrderDetails.size()>0){
                        record.setCalibrationResult("异常");
                    }else{
                        record.setCalibrationResult("正常");
                    }
                }else{
                    List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
                            .eq(CalibrationOrderReport::getCalibrationOrderId, id)
                            .eq(CalibrationOrderReport::getJudgmentResult, "fail")
                            .eq(CalibrationOrderReport::getDelFlag, "0").list();
                    if(calibrationOrderReports.size()>0){
                        record.setCalibrationResult("异常");
                    }else{
                        record.setCalibrationResult("正常");
                    }
                }
            }
        }
//        for (CalibrationOrder record : pageList.getRecords()) {
//            String id = record.getId();
//            String status = record.getStatus();
//            String managementMode = record.getManagementMode();
//            String equipmentId = record.getEquipmentId();
//            Equipment equipment = equipmentService.getById(equipmentId);
//            if(equipment != null){
//                record.setEquipmentNum(equipment.getNum());
//                record.setEquipmentName(equipment.getName());
//                record.setEquipmentModel(equipment.getModel());
//                record.setEquipmentSpecification(equipment.getSpecification());
//            }
//            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
//            record.setPrecisionParameterList(precisionParameterList);
//            if("4".equals(status)){
//                if("data".equals(managementMode)){
//                    List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
//                            .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
//                            .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
//                            .eq(CalibrationOrderDetail::getDelFlag,"0").list();
//                    if(calibrationOrderDetails.size()>0){
//                        record.setCalibrationResult("异常");
//                    }else{
//                        record.setCalibrationResult("正常");
//                    }
//                }else{
//                    List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
//                            .eq(CalibrationOrderReport::getCalibrationOrderId, id)
//                            .eq(CalibrationOrderReport::getJudgmentResult, "fail")
//                            .eq(CalibrationOrderReport::getDelFlag, "0").list();
//                    if(calibrationOrderReports.size()>0){
//                        record.setCalibrationResult("异常");
//                    }else{
//                        record.setCalibrationResult("正常");
//                    }
//                }
//            }
//        }
        return Result.OK(pageList);
    }
    /**
@@ -612,19 +612,25 @@
    @RequestMapping(value = "/saveFinal", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> saveFinal(@RequestBody CalibrationOrder calibrationOrder) {
        calibrationOrder.setCalibrationTime(new Date());
        calibrationOrder.setStatus("5");
        if(StringUtils.isNotBlank(calibrationOrder.getEquipmentId())){
            String equipmentId = calibrationOrder.getEquipmentId();
            Equipment equipment = equipmentService.getById(equipmentId);
            if(ObjectUtils.isNotNull(equipment)){
                LocalDate currentDate = LocalDate.now();
                // 添加维护周期的日期
                String checkPeriod = equipment.getCheckPeriod();
                if(StringUtils.isNotBlank(checkPeriod)){
                    LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(checkPeriod));
                    Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
                    equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
                    equipment.setTechnologyStatusQualificationTime(new Date());
                    equipment.setNextTechnologyStatusQualificationTime(result);
                }else {
                    return Result.error("该设备尚未维护检定周期，请先维护检定周期");
                }

                // 添加30天
                LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
                // 转换为java.util.Date
                Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
                equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
                equipment.setTechnologyStatusQualificationTime(new Date());
                equipment.setNextTechnologyStatusQualificationTime(result);
                equipmentService.updateById(equipment);
            }