From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
index 9324d5d..8a63d8f 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessReport.java
@@ -17,7 +17,7 @@
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@Getter
@@ -26,18 +26,15 @@
@ApiModel(value = "ProcessReport瀵硅薄", description = "妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
public class ProcessReport implements Serializable {
+ @TableField(select = false,exist = false)
+ //瀵煎嚭搴忓彿
+ private Integer indexs;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("妫�楠屾姤鍛婄紪鍙�")
private String insReportCode;
-
- @ApiModelProperty("椤垫暟")
- private String pages;
-
- @ApiModelProperty("鍙戦�佷唤鏁�")
- private String number;
@ApiModelProperty("鍙戝線浣曞")
private String send;
@@ -51,19 +48,8 @@
@ApiModelProperty("鍙戦�佷汉")
private Integer sendUser;
-
- @TableField(select = false,exist = false)
- private String sendUserName;
-
@ApiModelProperty("绛炬敹浜�")
private String signatory;
-
-
- @TableField(select = false,exist = false)
- private String signatoryUrl;
-
- @TableField(select = false,exist = false)
- private String signatoryName;
@ApiModelProperty("澶囨敞")
private String remark;
@@ -79,4 +65,15 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
+
+ @ApiModelProperty("棰嗘姤鍛婃棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate receiveDate;
+
+ @ApiModelProperty("棰嗘姤鍛婁汉")
+ private String receiveUser;
+
}
--
Gitblit v1.9.3