From cda9decfde8c6b518639c5da506aa293c07f88ff Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 16:43:04 +0800
Subject: [PATCH] 修改附件上传用户id类型为string,及审核页面不显示带文件上传状态
---
src/main/java/com/webmanage/service/OrderInfoService.java | 2 +-
src/main/resources/mapper/OrderInfoMapper.xml | 4 ++--
src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java | 2 +-
src/main/java/com/webmanage/entity/OrderAttachment.java | 2 +-
src/main/java/com/webmanage/controller/OrderController.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index 069bf5f..418d9c0 100644
--- a/src/main/java/com/webmanage/controller/OrderController.java
+++ b/src/main/java/com/webmanage/controller/OrderController.java
@@ -192,7 +192,7 @@
@ApiParam("闄勪欢鍦板潃") @RequestParam @NotBlank String fileUrl,
@ApiParam("瀛樺偍妗跺悕绉�") @RequestParam String bucketName,
@ApiParam("瀵硅薄鍚嶇О") @RequestParam String objectName,
- @ApiParam("涓婁紶鐢ㄦ埛ID") @RequestParam @NotNull Long uploadUserId,
+ @ApiParam("涓婁紶鐢ㄦ埛ID") @RequestParam @NotNull String uploadUserId,
@ApiParam("涓婁紶鐢ㄦ埛鍚�") @RequestParam @NotBlank String uploadUserName,
@ApiParam("闄勪欢绫诲瀷") @RequestParam String attachmentType,
@ApiParam("闄勪欢鎻忚堪") @RequestParam String description) {
diff --git a/src/main/java/com/webmanage/entity/OrderAttachment.java b/src/main/java/com/webmanage/entity/OrderAttachment.java
index c7774ec..e8c9052 100644
--- a/src/main/java/com/webmanage/entity/OrderAttachment.java
+++ b/src/main/java/com/webmanage/entity/OrderAttachment.java
@@ -59,7 +59,7 @@
@ApiModelProperty("涓婁紶鐢ㄦ埛ID")
@TableField("upload_user_id")
- private Long uploadUserId;
+ private String uploadUserId;
@ApiModelProperty("涓婁紶鐢ㄦ埛鍚�")
@TableField("upload_user_name")
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 0c7ea15..6d0b1d3 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -60,7 +60,7 @@
*/
Long uploadOrderAttachment(String orderId, String fileName, String originalName,
String fileType, Long fileSize, String fileUrl,
- String bucketName, String objectName, Long uploadUserId,
+ String bucketName, String objectName, String uploadUserId,
String uploadUserName, String attachmentType, String description);
/**
diff --git a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
index b12d62b..fed0d0e 100644
--- a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
+++ b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
@@ -635,7 +635,7 @@
@Transactional(rollbackFor = Exception.class)
public Long uploadOrderAttachment(String orderId, String fileName, String originalName,
String fileType, Long fileSize, String fileUrl,
- String bucketName, String objectName, Long uploadUserId,
+ String bucketName, String objectName, String uploadUserId,
String uploadUserName, String attachmentType, String description) {
// 鍙傛暟鏍￠獙
if (!StringUtils.hasText(orderId)) {
diff --git a/src/main/resources/mapper/OrderInfoMapper.xml b/src/main/resources/mapper/OrderInfoMapper.xml
index 9eceefb..ed2ceb7 100644
--- a/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/src/main/resources/mapper/OrderInfoMapper.xml
@@ -153,7 +153,7 @@
<include refid="Base_Column_List"/>
FROM tb_order_info
WHERE deleted = 0
- AND order_status IN ('寰呬笂浼犳枃浠�', '寰呭鎵规巿鏉�','寰呮巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸插彇娑�')
+ AND order_status IN ('寰呭鎵规巿鏉�','寰呮巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸插彇娑�')
<if test="orderStatus != null and orderStatus != ''">
AND order_status = #{orderStatus}
</if>
@@ -203,7 +203,7 @@
<include refid="Base_Column_List"/>
FROM tb_order_info
WHERE deleted = 0
- AND order_status IN ('寰呬笂浼犳枃浠�', '寰呮巿鏉�', '寰呭鎵规巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸插彇娑�')
+ AND order_status IN ('寰呮巿鏉�', '寰呭鎵规巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸插彇娑�')
<if test="orderStatus != null and orderStatus != ''">
AND order_status = #{orderStatus}
</if>
--
Gitblit v1.8.0