From 5e55cbc7cf95b0f892ae4066a7699a5f76a0f2f3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 23 十二月 2025 18:25:31 +0800
Subject: [PATCH] 修改字段，接口
---
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 0efe755..0ddda5b 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.lavorissue.dto.LaborIssueDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* @author :yys
@@ -34,10 +36,16 @@
private Integer season;
/**
- * 閮ㄩ棬鍚嶇О
+ * 閮ㄩ棬宀椾綅id
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty("閮ㄩ棬宀椾綅id")
+ private Integer deptPositionId;
+
+ /**
+ * 閮ㄩ棬宀椾綅鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬宀椾綅鍚嶇О")
+ @Excel(name = "閮ㄩ棬宀椾綅鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -47,6 +55,10 @@
@ApiModelProperty("鍔充繚鍗曞彿")
@Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鎵归噺鍙戞斁")
+ private List<LaborIssueDto> laborIssueList;
/**
* 鍛樺伐id
@@ -106,15 +118,6 @@
private Long num;
/**
- * 棰嗙敤鏃ユ湡
- */
- @ApiModelProperty("棰嗙敤鏃ユ湡")
- @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date adoptedDate;
-
- /**
* 杩涘巶鏃ユ湡
*/
@ApiModelProperty("杩涘巶鏃ユ湡")
@@ -133,6 +136,15 @@
private Date issueDate;
/**
+ * 棰嗙敤鏃ユ湡
+ */
+ @ApiModelProperty("棰嗙敤鏃ユ湡")
+ @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date adoptedDate;
+
+ /**
* 绛惧悕
*/
@Excel(name = "绛惧悕")
--
Gitblit v1.9.3