From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
index 3d02bbe..0e672b4 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -16,6 +18,7 @@
*/
@Data
@TableName("collect_bridge")
+@NoArgsConstructor
public class CollectBridge {
@TableId(value = "id", type = IdType.AUTO)
@@ -24,11 +27,28 @@
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
+ @ApiModelProperty("璁惧缂栧彿")
+ private String deviceCode;
+
@ApiModelProperty("閲囬泦鍊�")
- private String collectValue;
+ private BigDecimal collectValue;
- @ApiModelProperty("鏃堕棿")
- private LocalDateTime collectDate;
+ @ApiModelProperty("閲囬泦娓╁害")
+ private Double collectTemperature;
+ @ApiModelProperty("绗竴娆￠噰闆嗘椂闂�")
+ private LocalDateTime firstCollectDate;
+
+ @ApiModelProperty("鏈�鍚庝竴娆￠噰闆嗘椂闂�")
+ private LocalDateTime lastCollectDate;
+
+ public CollectBridge(String entrustCode,String deviceCode, BigDecimal collectValue, Double collectTemperature, LocalDateTime firstCollectDate, LocalDateTime lastCollectDate) {
+ this.entrustCode = entrustCode;
+ this.deviceCode = deviceCode;
+ this.collectValue = collectValue;
+ this.collectTemperature = collectTemperature;
+ this.firstCollectDate = firstCollectDate;
+ this.lastCollectDate = lastCollectDate;
+ }
}
--
Gitblit v1.9.3