From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改,定时任务在线问题修改新增导出扣分明细功能
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index e85eded..3c6fb07 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -101,7 +101,13 @@
/** 杩愮淮澶勭悊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "杩愮淮澶勭悊鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime ywHandleTime;
+
+ /** 瀹℃牳閫氳繃鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹℃牳鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime passTime;
/** 杩愮淮缁撴灉 */
private String ywResult;
@@ -119,7 +125,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date distributeTime;
- private Date auditTime;
/** 涓嬪彂浜� */
private String realName;
@@ -127,7 +132,14 @@
* 鏄惁鎵h繃绉垎
*/
private Boolean deduct;
+ //澶勭悊鏃堕棿鐐归泦鍚�
+ private List<Date> handleTimeList;
+ private Date handleTime;
+ //瀹℃牳鏃堕棿鐐归泦鍚�
+ private List<Date> auditTimeList;
+ private Date auditTime;
+ private Boolean hasReport;
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
if(vo == null) {
--
Gitblit v1.8.0