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流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsReport.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsReport.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsReport.java
index 9d69801..9e90240 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsReport.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsReport.java
@@ -18,6 +18,7 @@
/**
*
*/
+ @ApiModelProperty("涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
@@ -27,25 +28,35 @@
/**
* 澶栭敭锛氭楠屽崟id
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("妫�楠屽崟id")
private Integer insOrderId;
+
+ /** 0锛氭娴嬫姤鍛婏紙浠呮娴嬫暟鎹級锛�1锛氭楠屾姤鍛婏紙鍚垽瀹氱粨鏋滐級 */
+ @ApiModelProperty("鎶ュ憡绫诲瀷锛�0锛氭娴嬫姤鍛婏紝1锛氭楠屾姤鍛�")
+ private Integer reportType;
/**
* 绯荤粺鐢熸垚鎶ュ憡鍦板潃
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
private String url;
+
+ /**
+ * 绯荤粺鐢熸垚鐨勬楠屾姤鍛婂湴鍧�锛涗笌 url 瀵瑰簲鐨勬娴嬫姤鍛婂叡鐢ㄥ悓涓�鏉″鎵硅褰曘��
+ */
+ @ApiModelProperty("妫�楠屾姤鍛婂湴鍧�")
+ private String inspectionUrl;
/**
* 鎵嬪姩涓婁紶鎶ュ憡鍦板潃
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String urlS;
/**
* 涓存椂鎶ュ憡鍦板潃
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("涓存椂鎶ュ憡鍦板潃")
private String tempUrlPdf;
/**
@@ -69,21 +80,22 @@
/**
* 澶栭敭锛氱敤鎴穒d锛堟彁浜や汉锛�
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("鎻愪氦浜虹敤鎴穒d")
private Integer writeUserId;
/**
* 澶栭敭锛氱敤鎴穒d锛堟壒鍑嗕汉锛�
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("鎵瑰噯浜虹敤鎴穒d")
private Integer ratifyUserId;
/**
* 澶栭敭锛氱敤鎴穒d锛堝鏍镐汉锛�
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("瀹℃牳浜虹敤鎴穒d")
private Integer examineUserId;
+ @ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -92,6 +104,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ApiModelProperty("鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@@ -122,4 +135,28 @@
@ApiModelProperty(value = "鏄惁鏄�氳繃鐨勬姤鍛�, 0:鏈�氳繃, 1:閫氳繃")
private Integer isPass;
+ @ApiModelProperty(value = "鎵瑰噯鏃堕�夌敤鐨勫嵃绔爄d锛堝閫夛紝閫楀彿鍒嗛殧锛�")
+ private String sealIds;
+
+ @ApiModelProperty(value = "鎵瑰噯鏃堕�夌敤鐨勫嵃绔犲悕绉帮紙澶氫釜锛岄�楀彿鍒嗛殧锛�")
+ private String sealNames;
+
+ @ApiModelProperty(value = "MA鏍囧織绔爄d锛圥DF绗�1椤靛乏涓婅锛�")
+ private Integer maSealId;
+
+ @ApiModelProperty(value = "MA鏍囧織绔犲悕绉�")
+ private String maSealName;
+
+ @ApiModelProperty(value = "鎶ュ憡绔爄d锛堝搴旀ā鏉� seal1銆乻eal2锛�")
+ private Integer reportSealId;
+
+ @ApiModelProperty(value = "鎶ュ憡绔犲悕绉�")
+ private String reportSealName;
+
+ @ApiModelProperty(value = "PDF楠戠紳绔犵殑鍗扮珷id")
+ private Integer seamSealId;
+
+ @ApiModelProperty(value = "PDF楠戠紳绔犵殑鍗扮珷鍚嶇О")
+ private String seamSealName;
+
}
--
Gitblit v1.9.3