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 | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 2772d6e..0ddda5b 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.annotation.*;
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;
@@ -10,6 +12,7 @@
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* @author :yys
@@ -18,20 +21,44 @@
@Data
@TableName("labor_issue")
@ApiModel
-public class LaborIssue {
+public class LaborIssue extends StartAndEndDateDto {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ @ApiModelProperty("1-宸查鍙栧姵淇濇暟閲� 2-鏈鍙栧姵淇濇暟閲� 3-瓒呮椂宸查鍙栧姵淇濇暟閲� 4-瓒呮椂鏈鍙栧姵淇濇暟閲�")
+ private Integer status;
+
+ @TableField(exist = false)
+ private Integer season;
+
/**
- * 閮ㄩ棬鍚嶇О
+ * 閮ㄩ棬宀椾綅id
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty("閮ㄩ棬宀椾綅id")
+ private Integer deptPositionId;
+
+ /**
+ * 閮ㄩ棬宀椾綅鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬宀椾綅鍚嶇О")
+ @Excel(name = "閮ㄩ棬宀椾綅鍚嶇О")
@TableField(exist = false)
private String deptName;
+
+ /**
+ * 鍔充繚鍗曞彿
+ */
+ @ApiModelProperty("鍔充繚鍗曞彿")
+ @Excel(name = "鍔充繚鍗曞彿")
+ private String orderNo;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鎵归噺鍙戞斁")
+ private List<LaborIssueDto> laborIssueList;
/**
* 鍛樺伐id
@@ -56,6 +83,20 @@
private String staffNo;
/**
+ * 鍔充繚绫诲瀷-瀛楀吀
+ */
+ @ApiModelProperty("鍔充繚绫诲瀷-瀛楀吀")
+ private String dictType;
+
+ /**
+ * 鍔充繚绫诲瀷
+ */
+ @ApiModelProperty("鍔充繚绫诲瀷")
+ @Excel(name = "鍔充繚绫诲瀷")
+ @TableField(exist = false)
+ private String dictTypeName;
+
+ /**
* 闃插叿鍚嶇О-瀛楀吀
*/
@ApiModelProperty("闃插叿鍚嶇О-瀛楀吀")
@@ -77,6 +118,24 @@
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 factoryDate;
+
+ /**
+ * 鍙戞斁鏃ユ湡
+ */
+ @ApiModelProperty("鍙戞斁鏃ユ湡")
+ @Excel(name = "鍙戞斁鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date issueDate;
+
+ /**
* 棰嗙敤鏃ユ湡
*/
@ApiModelProperty("棰嗙敤鏃ユ湡")
--
Gitblit v1.9.3