From be43e890802f764590489d510cfc95f40eba5f47 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 23 四月 2026 11:19:54 +0800
Subject: [PATCH] 保存成功返回ID,姓名，上报人模糊查询
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 15 +++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 6 +++++-
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java | 6 +++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 6 +++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 4 ++--
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 2 +-
9 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
index 720b8db..f3186e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
@@ -92,7 +92,11 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDeathinfo serviceDeathinfo) {
- return toAjax(serviceDeathinfoService.save(serviceDeathinfo));
+ Boolean result= serviceDeathinfoService.save(serviceDeathinfo);
+ if (result) {
+ return AjaxResult.success(serviceDeathinfo.getId());
+ } else
+ return AjaxResult.error();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
index 1572d9f..4f27601 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
@@ -92,7 +92,11 @@
public AjaxResult add(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
ServiceDonatemaintenanceEntity serviceDonatemaintenance = DtoConversionUtils.sourceToTarget(serviceDonatemaintenanceVO, ServiceDonatemaintenanceEntity.class);
serviceDonatemaintenance.setItemDesc(serviceDonatemaintenanceVO.getItemDesc().toString());
- return toAjax(serviceDonatemaintenanceService.save(serviceDonatemaintenance));
+ boolean result = serviceDonatemaintenanceService.save(serviceDonatemaintenance);
+ if (result) {
+ return AjaxResult.success(serviceDonatemaintenance.getId());
+ } else
+ return AjaxResult.error();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
index 42e56c9..cd9f7ba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -101,7 +101,11 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
- return toAjax(serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate));
+ boolean result=serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate);
+ if (result) {
+ return AjaxResult.success(serviceEthicalreviewinitiate.getId());
+ } else
+ return AjaxResult.error();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 55e5c2f..92bdf14 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -112,7 +112,7 @@
// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
log.info("鏂板鍖诲璇勪及鐨刬nfoid涓猴細{}",serviceMedicalevaluationVO.getInfoid());
- boolean save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
+ long save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
return AjaxResult.success(save);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index e5cf36f..865fc4a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -410,5 +410,20 @@
@Excel(name = "涓婃姤鐨勫尰闄�", readConverterExp = "涓婃姤鐨勫尰闄�")
private String toHospital;
+
+ /**
+ * 纭鎰忚锛堟帴鏀讹紝鏀惧純-闇�瑕佽鏄庡師鍥狅級
+ */
+ @ApiModelProperty("纭鎰忚锛堟帴鏀讹紝鏀惧純-闇�瑕佽鏄庡師鍥狅級")
+ @Excel(name = "纭鎰忚锛堟帴鏀讹紝鏀惧純-闇�瑕佽鏄庡師鍥狅級", readConverterExp = "纭鎰忚锛堟帴鏀讹紝鏀惧純-闇�瑕佽鏄庡師鍥狅級")
+ private String confirmResult;
+
+ /**
+ * 纭鏃堕棿
+ */
+ @ApiModelProperty("纭鏃堕棿")
+ @Excel(name = "纭鏃堕棿", readConverterExp = "纭鏃堕棿")
+ private Date confirmTime;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
index ecba740..f5459d3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
@@ -27,7 +27,7 @@
*/
public List<ServiceMedicalevaluation> queryList(ServiceMedicalevaluation serviceMedicalevaluation);
- public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
+ public long add(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
public Boolean edit(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
index 316c604..5e13a37 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
@@ -76,7 +76,7 @@
}
@Override
- public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
+ public long add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
boolean save = save(serviceMedicalevaluation);
if (save && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())) {
@@ -86,7 +86,7 @@
serviceMedicalevaluationorganMapper.insert(serviceMedicalevaluationorgan);
}
}
- return save;
+ return serviceMedicalevaluation.getId();
}
@Override
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index bc0be20..185951c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -463,7 +463,7 @@
<where>sd.del_flag = 0
<if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
<if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
- <if test="name != null ">AND sd.Name = #{name}</if>
+ <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if>
<if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
<if test="startAge != null">AND sd.age >= #{startAge}</if>
<if test="endAge !=null">AND sd.age <= #{endAge}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 68024d7..53056ce 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -78,8 +78,8 @@
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
<if test="reportTime != null ">and ReportTime = #{reportTime}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
- <if test="name != null and name != ''">and name = #{name}</if>
- <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name like concat('%', #{coordinatorName}, '%')</if>
<if test="itemNo != null and itemNo != ''">and item_no = #{itemNo}</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemTime != null ">and item_time = #{itemTime}</if>
--
Gitblit v1.9.3