From a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 四月 2024 11:46:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java | 14 +++++++-------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 8 ++++++++
2 files changed, 15 insertions(+), 7 deletions(-)
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 1152ca9..526a61d 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -548,6 +549,13 @@
Boolean i = null;
for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
log.info("鎹愮尞瑙佽瘉绠＄悊id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
+ ServiceDonationwitness sd2 = new ServiceDonationwitness();
+ sd2.setInfoid(serviceDonationwitness.getInfoid());
+ sd2.setDel_flag(0);
+ List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
+ serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());
+ }
if (serviceDonationwitness.getId() == null) {
i = serviceDonationwitnessService.save(serviceDonationwitness);
} else {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java
index 2b0b839..f5ac520 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java
@@ -66,43 +66,43 @@
/**
* 鍗″彿
*/
- @ApiModelProperty("鍗″彿")
- @Excel(name = "鍗″彿")
+ @ApiModelProperty("閾惰甯愬彿/鍗″彿")
+ @Excel(name = "閾惰甯愬彿/鍗″彿")
private String bankcardno;
/**
* $column.columnComment
*/
@ApiModelProperty("$column.columnComment")
- @Excel(name = "鍗″彿")
+ @Excel(name = "绋庡墠閲戦")
private BigDecimal pretaxamount;
/**
* $column.columnComment
*/
@ApiModelProperty("$column.columnComment")
- @Excel(name = "鍗″彿")
+ @Excel(name = "鎵ｇ◣閲戦")
private BigDecimal taxamount;
/**
* $column.columnComment
*/
@ApiModelProperty("$column.columnComment")
- @Excel(name = "鍗″彿")
+ @Excel(name = "绋庡悗閲戦")
private BigDecimal taxedamount;
/**
* $column.columnComment
*/
@ApiModelProperty("$column.columnComment")
- @Excel(name = "鍗″彿")
+ @Excel(name = "鍙備笌妗堜緥")
private String donorname;
/**
* $column.columnComment
*/
@ApiModelProperty("$column.columnComment")
- @Excel(name = "鍗″彿")
+ @Excel(name = "鎵�灞炲崟浣�")
private String unitname;
}
--
Gitblit v1.9.3