From c39c4a43afeb97619711a0c4e8d05527dc72d1f7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 28 九月 2025 10:49:33 +0800
Subject: [PATCH] 修改字段
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 10 ++++------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 6 +++---
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 2e8e047..c6c9206 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -195,12 +195,10 @@
@ApiModelProperty("瀛﹀巻")
private String education;
-
-
- /** 鑱屼笟 */
+ /**
+ * 鑱屼笟
+ */
@ApiModelProperty("鑱屼笟")
- private String work;
-
-
+ private String occupation;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 2593b88..f4ed698 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -702,7 +702,7 @@
map.put("鍙戠エ闄勪欢", fpuuid);
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
- map.put("绋庨", null);
+ map.put("绋庨", serviceFunddetailShared.getTaxamount());
long qtuuid = COUNTER.incrementAndGet();
map.put("鍏朵粬闄勪欢", qtuuid);
map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode());
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 4f1ce55..bf55b0e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -49,11 +49,11 @@
<result property="operatorname" column="operatorname" />
<result property="nation" column="nation" />
<result property="education" column="education" />
- <result property="work" column="work" />
+ <result property="occupation" column="occupation" />
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
- select ID, InfoID,nation,education,work, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
+ select ID, InfoID,nation,education,occupation, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
</sql>
<select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
@@ -154,7 +154,7 @@
`service_relativesconfirmation`.`operatorname` AS `operatorname`,
`service_relativesconfirmation`.`nation` AS `nation`,
`service_relativesconfirmation`.`education` AS `education`,
- `service_relativesconfirmation`.`work` AS `work`
+ `service_relativesconfirmation`.`occupation` AS `occupation`
FROM
`service_donatebaseinfo`
--
Gitblit v1.9.3