小修改

“linengliang”

2023-10-19 95721904f53ac9d54ad3622f9430d78e9eec8a23

小修改

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

@@ -612,6 +612,7 @@
    @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);
@@ -619,12 +620,18 @@
                LocalDate currentDate = LocalDate.now();

                // 添加30天
                LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
                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("该设备尚未维护检定周期，请先维护检定周期");
                }

                // 转换为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);
            }