From 92153ecb458b62b04f84666c63fd389a5ee9f738 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:05:45 +0800
Subject: [PATCH] feat: 标准查新新增查新时间、查新结果、来源网址及删除接口
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java | 9 ++++
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodSearchNew.java | 14 +++++++
cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml | 3 +
cnas-process/src/main/java/com/ruoyi/process/service/ProcessMethodSearchNewService.java | 7 +++
sql/lims_delta.sql | 7 +++
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java | 23 +++++++++++
6 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
index dc137e8..b830ccf 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
@@ -59,6 +59,15 @@
}
/**
+ * 鍒犻櫎鏍囧噯鏌ユ柊
+ */
+ @Operation(summary = "鍒犻櫎鏍囧噯鏌ユ柊")
+ @DeleteMapping("/delMethodSearchNew")
+ public Result delMethodSearchNew(Integer methodSearchNewId) {
+ return Result.success(processMethodSearchNewService.delMethodSearchNew(methodSearchNewId));
+ }
+
+ /**
* 鏍囧噯鏌ユ柊鍒楄〃
*/
@Operation(summary = "鏍囧噯鏌ユ柊鍒楄〃")
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodSearchNew.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodSearchNew.java
index 0d19b3d..840eae1 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodSearchNew.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodSearchNew.java
@@ -46,6 +46,20 @@
@Schema(description = "鏌ユ柊璁板綍鏉ユ簮, 0,鏍囧噯缃�, 1濮旀墭鎯呮姤, 2鏍囧噯鏁�, 3鍏朵粬")
private Integer searchNewSource;
+ @Schema(description = "鏌ユ柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime searchNewTime;
+
+ @Schema(description = "鏌ユ柊缁撴灉")
+ private String searchNewResult;
+
+ @Schema(description = "鏉ユ簮涓哄叾浠栨椂濉啓鐨勫叿浣撶綉鍧�鎴栫綉绔欏悕绉�")
+ private String searchNewWebsite;
+
+ @Schema(description = "鏌ユ柊浜�")
+ @TableField(exist = false)
+ private String searchNewUserName;
+
@Schema(description = "澶囨敞,0浣滃簾, 1鏇挎崲")
private Integer remark;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessMethodSearchNewService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessMethodSearchNewService.java
index 9e6f120..d6d1257 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessMethodSearchNewService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessMethodSearchNewService.java
@@ -31,6 +31,13 @@
boolean updateMethodSearchNew(ProcessMethodSearchNew processMethodSearchNew);
/**
+ * 鍒犻櫎鏍囧噯鏌ユ柊
+ * @param methodSearchNewId 鏍囧噯鏌ユ柊璁板綍ID
+ * @return
+ */
+ boolean delMethodSearchNew(Integer methodSearchNewId);
+
+ /**
* 鏍囧噯鏌ユ柊鍒楄〃
* @param processMethodSearchNew
* @return
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
index c7f13bb..8790ea3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
@@ -77,6 +77,9 @@
processMethodSearchNew.setStandardMethodId(null);
processMethodSearchNew.setCurrentAutoStandardId(null);
processMethodSearchNew.setAutoArchivedTime(null);
+ if (!Integer.valueOf(3).equals(processMethodSearchNew.getSearchNewSource())) {
+ processMethodSearchNew.setSearchNewWebsite(null);
+ }
}
// 鏂板
this.saveBatch(processMethodSearchNewList);
@@ -101,10 +104,30 @@
.set(ProcessMethodSearchNew::getNewMethodName, processMethodSearchNew.getNewMethodName())
.set(ProcessMethodSearchNew::getNewStandardNo, processMethodSearchNew.getNewStandardNo())
.set(ProcessMethodSearchNew::getSearchNewSource, processMethodSearchNew.getSearchNewSource())
+ .set(ProcessMethodSearchNew::getSearchNewTime, processMethodSearchNew.getSearchNewTime())
+ .set(ProcessMethodSearchNew::getSearchNewResult, processMethodSearchNew.getSearchNewResult())
+ .set(ProcessMethodSearchNew::getSearchNewWebsite,
+ Integer.valueOf(3).equals(processMethodSearchNew.getSearchNewSource())
+ ? processMethodSearchNew.getSearchNewWebsite() : null)
.set(ProcessMethodSearchNew::getRemark, processMethodSearchNew.getRemark())
.set(ProcessMethodSearchNew::getIsNewStandard, 1));
}
+ @Override
+ public boolean delMethodSearchNew(Integer methodSearchNewId) {
+ if (methodSearchNewId == null) {
+ throw new ErrorException("缂哄皯鏍囧噯鏌ユ柊璁板綍id");
+ }
+ ProcessMethodSearchNew old = getById(methodSearchNewId);
+ if (old == null) {
+ throw new ErrorException("鏍囧噯鏌ユ柊璁板綍涓嶅瓨鍦�");
+ }
+ if (Integer.valueOf(1).equals(old.getIsAutoArchived())) {
+ throw new ErrorException("鑷姩褰掓。璁板綍涓嶅厑璁稿垹闄�");
+ }
+ return removeById(methodSearchNewId);
+ }
+
/**
* 鏍囧噯鏌ユ柊鍒楄〃
*
diff --git a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
index d446e4d..c006f77 100644
--- a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
@@ -4,7 +4,8 @@
<!-- 鏍囧噯鏌ユ柊鍒嗛〉鏌ヨ -->
<select id="pageMethodSearchNew" resultType="com.ruoyi.process.pojo.ProcessMethodSearchNew">
- select *
+ select a.*,
+ (select u.name from user u where u.id = a.create_user) as searchNewUserName
from (select *
from cnas_process_method_search_new
<where>
diff --git a/sql/lims_delta.sql b/sql/lims_delta.sql
index f2d53dc..d1929a5 100644
--- a/sql/lims_delta.sql
+++ b/sql/lims_delta.sql
@@ -98,3 +98,10 @@
update_time datetime comment '鏇存柊鏃堕棿',
primary key (column_id)
) engine=innodb auto_increment=1 comment = '浠g爜鐢熸垚涓氬姟琛ㄥ瓧娈�';
+
+-- 21銆佹爣鍑嗘煡鏂拌〃澧炲姞鏌ユ柊鏃堕棿銆佹煡鏂扮粨鏋溿�佸叾浠栨潵婧愮綉鍧�
+-- 浠呭湪鐩爣搴撶己灏戣繖浜涘垪鏃舵墽琛屼竴娆�
+alter table cnas_process_method_search_new
+ add column search_new_time datetime default null comment '鏌ユ柊鏃堕棿' after search_new_source,
+ add column search_new_result varchar(500) default null comment '鏌ユ柊缁撴灉' after search_new_time,
+ add column search_new_website varchar(500) default null comment '鏉ユ簮涓哄叾浠栨椂鐨勫叿浣撶綉鍧�鎴栫綉绔欏悕绉�' after search_new_result;
--
Gitblit v1.9.3