From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 74fd9d2..d6fc797 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,28 +27,37 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "宸℃浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
+
+ @ApiModelProperty(value = "璁惧id")
+ private Integer taskId;
@ApiModelProperty(value = "宸℃浜篒D")
private String inspectorId;
@ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Excel(name = "鎵ц宸℃浜哄憳")
private String inspector;
@ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Excel(name = "澶囨敞")
private String remarks;
@ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
private Long registrantId;
@ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜�")
private String registrant;
@ApiModelProperty(value = "棰戞")
+ @Excel(name = "棰戞")
private String frequencyType;
@ApiModelProperty(value = "鏃堕棿缁嗚妭")
+ @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
@ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
@@ -58,17 +68,18 @@
@ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
- private String createUser;
+ private Integer createUser;
@ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
- private String updateUser;
+ private Integer updateUser;
@ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
@@ -76,6 +87,6 @@
@ApiModelProperty(value = "绉熸埛")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
--
Gitblit v1.9.3