From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
index 8ebc195..285c4f2 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
@@ -7,7 +7,7 @@
import com.ruoyi.staff.pojo.StaffEducation;
import com.ruoyi.staff.pojo.StaffEmergencyContact;
import com.ruoyi.staff.pojo.StaffWorkExperience;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -64,22 +64,22 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓寮�濮嬫椂闂�")
+ @Schema(description = "鍚堝悓寮�濮嬫椂闂�")
@Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 15)
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓缁撴潫鏃堕棿")
+ @Schema(description = "鍚堝悓缁撴潫鏃堕棿")
@Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 16)
private Date contractEndTime;
- @ApiModelProperty(value = "鍚堝悓鏈熼檺")
+ @Schema(description = "鍚堝悓鏈熼檺")
@Excel(name = "鍚堝悓鏈熼檺", sort = 17)
private String contractTerm;
- @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @Schema(description = "鍑虹敓鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 18)
--
Gitblit v1.9.3