feat(sales): 添加框架合同订单功能并优化销售台账管理

云

8 小时以前 55d694aaae4e421b5e55cd941500e08f85cb5d4d

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java

@@ -2,6 +2,7 @@

import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.MaintenanceTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -18,9 +19,9 @@
import java.util.Set;

@Component
@DisallowConcurrentExecution // 禁止并发执行同一个Job
@DisallowConcurrentExecution
public class MaintenanceTaskJob implements Job, Serializable {
    private static final long serialVersionUID = 1L; // 必须定义序列化ID
    private static final long serialVersionUID = 1L;

    @Autowired
    private DeviceMaintenanceServiceImpl deviceMaintenanceService;
@@ -92,11 +93,13 @@
        inspectionTask.setMaintenanceTaskId(timingTask.getId());
        inspectionTask.setDeviceLedgerId(timingTask.getTaskId());
        inspectionTask.setMaintenancePlanTime(LocalDateTime.now());
        inspectionTask.setMaintenanceActuallyName(timingTask.getMaintenancePerson());
        inspectionTask.setFrequencyType(timingTask.getFrequencyType());
        inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
        inspectionTask.setTenantId(timingTask.getTenantId());
        inspectionTask.setStatus(0);
        inspectionTask.setDeviceModel(timingTask.getDeviceModel());
        inspectionTask.setMachineryCategory(timingTask.getMachineryCategory());
        inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
        inspectionTask.setUpdateTime(LocalDateTime.now());
        inspectionTask.setCreateTime(LocalDateTime.now());
@@ -121,6 +124,8 @@
                    return calculateMonthlyNextTime(frequencyDetail, currentTime);
                case "QUARTERLY":
                    return calculateQuarterlyNextTime(frequencyDetail, currentTime);
                case "YEARLY":
                    return calculateYearlyNextTime(frequencyDetail, currentTime);
                default:
                    throw new IllegalArgumentException("不支持的频率类型: " + frequencyType);
            }
@@ -218,6 +223,23 @@
        );
    }

    private LocalDateTime calculateYearlyNextTime(String detail, LocalDateTime current) {
        String[] parts = detail.split(",");
        int month = Integer.parseInt(parts[0]);
        int day = Integer.parseInt(parts[1]);
        LocalTime time = LocalTime.parse(parts[2]);

        int year = current.getYear();
        LocalDateTime nextTime = LocalDateTime.of(java.time.LocalDate.of(year, month,
                Math.min(day, YearMonth.of(year, month).lengthOfMonth())), time);
        if (!nextTime.isAfter(current)) {
            year++;
            nextTime = LocalDateTime.of(java.time.LocalDate.of(year, month,
                    Math.min(day, YearMonth.of(year, month).lengthOfMonth())), time);
        }
        return nextTime;
    }

    /**
     * 解析星期几字符串
     */