From f4499fef3cddf792743f6ff509591a08c4dd40a7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 11:21:22 +0800
Subject: [PATCH] 在捐献、已获取、案例完成 状态连动保存
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 15 +++++++++++----
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 7 +++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index f6d5570..4ebc4ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonateorganBase;
@@ -18,10 +19,7 @@
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
-import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
-import com.ruoyi.project.service.IServiceDonatecomporganService;
-import com.ruoyi.project.service.IServiceDonateorganBaseService;
-import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.*;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -56,6 +54,9 @@
@Autowired
private IServiceDonatecomporganService serviceDonatecomporganService;
+
+ @Autowired
+ private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
private static Configuration configuration = null;
@@ -158,6 +159,12 @@
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
boolean edit = serviceDonatecompletioninfoService.edit(serviceDonatecompletioninfoVO);
+ if(edit&&serviceDonatecompletioninfoVO.getCompleteState()=="3"){
+ ServiceDonatebaseinfo donatebaseinfo=new ServiceDonatebaseinfo();
+ donatebaseinfo.setWorkflow(99);
+ donatebaseinfo.setId(serviceDonatecompletioninfoVO.getInfoid());
+ serviceDonatebaseinfoService.updateById(donatebaseinfo);
+ }
return toAjax(edit);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index 6f2e4a9..8284b7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
@@ -142,6 +143,12 @@
public AjaxResult edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
log.info("鏂板鎹愮尞瑙佽瘉id涓猴細{},infoId涓猴細{}", serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
Boolean edit = serviceDonationwitnessService.edit(serviceDonationwitnessVO);
+ if(edit&&serviceDonationwitnessVO.getWitnessState()=="3"){
+ ServiceDonatebaseinfo donatebaseinfo=new ServiceDonatebaseinfo();
+ donatebaseinfo.setWorkflow(6);
+ donatebaseinfo.setId(serviceDonationwitnessVO.getInfoid());
+ serviceDonatebaseinfoService.updateById(donatebaseinfo);
+ }
return toAjax(edit);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index e08b3de..7482cdb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -148,6 +148,7 @@
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
+ serviceDonatebaseinfo1.setWorkflow(2);
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
@@ -157,6 +158,7 @@
}
//鍒涘缓
serviceDonatebaseinfo1.setDonatetime(new Date());
+
return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
--
Gitblit v1.9.3