From 5deaede4715d2703aadcd33f94256b339b9e9140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 14 四月 2026 10:09:08 +0800
Subject: [PATCH] feat(sales): 添加发票和销售台账查询过滤功能
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 8d03b06..474d53e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -1,15 +1,14 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-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;
-import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -25,9 +24,6 @@
private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭ID
- */
@TableId(type = IdType.AUTO)
private Long id;
@@ -37,6 +33,16 @@
@ApiModelProperty(value = "璁惧id")
private Integer taskId;
+
+ @ApiModelProperty(value = "璁惧鍖哄煙id")
+ private Long areaId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍖哄煙鍚嶇О")
+ private String areaName;
+
+ @ApiModelProperty(value = "璁惧ID闆嗗悎")
+ private String taskIdsStr;
@ApiModelProperty(value = "宸℃浜�")
@Excel(name = "鎵ц宸℃浜�")
@@ -80,29 +86,33 @@
@ApiModelProperty(value = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @ApiModelProperty(value = "杞垹闄ゆ爣璁帮紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
+ @TableField(exist = false)
+ private String dateStr;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "澶氶�夎澶嘔D")
+ private Long[] taskIds;
+
@ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
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")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
}
--
Gitblit v1.9.3