Skip to content

Y
yd-csf
Commit 7bd4e4e5 by jianan
Options

Fna接口45

parent cbd0f212
Showing with 64 additions and 36 deletions
yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormAddRequest.java
......@@ -60,10 +60,16 @@ public class FnaFormAddRequest implements Serializable {
private LiquidAssets liquidAssets;
/**
* 保单持有人资产
* 自住用途之房地產
*/
@Schema(description = "保单持有人资产")
private OwnerAssets ownerAssets;
@Schema(description = "自住用途之房地產")
private List<OwnerProperties> primaryResidence;
/**
* 投資房地產
*/
@Schema(description = "投資房地產")
private List<InvestmentProperties> investment;
/**
* 公司业务资料
......@@ -75,7 +81,7 @@ public class FnaFormAddRequest implements Serializable {
* 其他问题
*/
@Schema(description = "Fna表单其他问题")
private FnaFormOther fnaFormOther;
private FnaFormOther other;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormUpdateRequest.java
......@@ -65,10 +65,16 @@ public class FnaFormUpdateRequest implements Serializable {
private LiquidAssets liquidAssets;
/**
* 保单持有人资产
* 自住用途之房地產
*/
@Schema(description = "保单持有人资产")
private OwnerAssets ownerAssets;
@Schema(description = "自住用途之房地產")
private List<OwnerProperties> primaryResidence;
/**
* 投資房地產
*/
@Schema(description = "投資房地產")
private List<InvestmentProperties> investment;
/**
* 公司业务资料
......@@ -80,7 +86,7 @@ public class FnaFormUpdateRequest implements Serializable {
* 其他问题
*/
@Schema(description = "Fna表单其他问题")
private FnaFormOther fnaFormOther;
private FnaFormOther other;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
yd-csf-service/src/main/java/com/yd/csf/service/model/FnaForm.java
......@@ -72,9 +72,14 @@ public class FnaForm implements Serializable {
private Object liquidAssets;
/**
* 保单持有人资产
* 自住用途之房地產
*/
private Object ownerAssets;
private Object primaryResidence;
/**
* 投資房地產
*/
private Object investment;
/**
* 公司业务资料
......@@ -84,10 +89,10 @@ public class FnaForm implements Serializable {
/**
* 表单其他问题
*/
private Object fnaFormOther;
private Object other;
/**
* 表单状态
* 表单状态 0-未完成 1-已完成
*/
private String fnaFormStatus;
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaFormServiceImpl.java
......@@ -8,7 +8,6 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.csf.service.common.ErrorCode;
import com.yd.csf.service.dao.FnaFormMapper;
import com.yd.csf.service.dto.*;
import com.yd.csf.service.model.FnaForm;
......@@ -21,11 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
......@@ -137,18 +132,23 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
if (liquidAssets != null) {
fnaFormVO.setLiquidAssets(GSON.fromJson(liquidAssets.toString(), LiquidAssets.class));
}
Object ownerAssets = fnaForm.getOwnerAssets();
if (ownerAssets != null) {
fnaFormVO.setOwnerAssets(GSON.fromJson(ownerAssets.toString(), new TypeToken<OwnerAssets>() {
Object primaryResidence = fnaForm.getPrimaryResidence();
if (primaryResidence != null) {
fnaFormVO.setPrimaryResidence(GSON.fromJson(primaryResidence.toString(), new TypeToken<List<OwnerProperties>>() {
}.getType()));
}
Object investment = fnaForm.getInvestment();
if (investment != null) {
fnaFormVO.setInvestment(GSON.fromJson(investment.toString(), new TypeToken<List<InvestmentProperties>>() {
}.getType()));
}
Object monthlyIncome = fnaForm.getCompanyBusinessData();
if (monthlyIncome != null) {
fnaFormVO.setCompanyBusinessData(GSON.fromJson(monthlyIncome.toString(), CompanyBusinessData.class));
}
Object fnaFormOther = fnaForm.getFnaFormOther();
if (fnaFormOther != null) {
fnaFormVO.setFnaFormOther(GSON.fromJson(fnaFormOther.toString(), FnaFormOther.class));
Object other = fnaForm.getOther();
if (other != null) {
fnaFormVO.setOther(GSON.fromJson(other.toString(), FnaFormOther.class));
}
return fnaFormVO;
......@@ -213,9 +213,10 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
fnaForm.setExistingSecurityInsured(GSON.toJson(fnaFormAddRequest.getExistingSecurityInsured()));
fnaForm.setIncomeExpense(GSON.toJson(fnaFormAddRequest.getIncomeExpense()));
fnaForm.setLiquidAssets(GSON.toJson(fnaFormAddRequest.getLiquidAssets()));
fnaForm.setOwnerAssets(GSON.toJson(fnaFormAddRequest.getOwnerAssets()));
fnaForm.setPrimaryResidence(GSON.toJson(fnaFormAddRequest.getPrimaryResidence()));
fnaForm.setInvestment(GSON.toJson(fnaFormAddRequest.getInvestment()));
fnaForm.setCompanyBusinessData(GSON.toJson(fnaFormAddRequest.getCompanyBusinessData()));
fnaForm.setFnaFormOther(GSON.toJson(fnaFormAddRequest.getFnaFormOther()));
fnaForm.setOther(GSON.toJson(fnaFormAddRequest.getOther()));
return fnaForm;
}
......@@ -231,9 +232,10 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
fnaForm.setExistingSecurityInsured(GSON.toJson(fnaFormUpdateRequest.getExistingSecurityInsured()));
fnaForm.setIncomeExpense(GSON.toJson(fnaFormUpdateRequest.getIncomeExpense()));
fnaForm.setLiquidAssets(GSON.toJson(fnaFormUpdateRequest.getLiquidAssets()));
fnaForm.setOwnerAssets(GSON.toJson(fnaFormUpdateRequest.getOwnerAssets()));
fnaForm.setPrimaryResidence(GSON.toJson(fnaFormUpdateRequest.getPrimaryResidence()));
fnaForm.setInvestment(GSON.toJson(fnaFormUpdateRequest.getInvestment()));
fnaForm.setCompanyBusinessData(GSON.toJson(fnaFormUpdateRequest.getCompanyBusinessData()));
fnaForm.setFnaFormOther(GSON.toJson(fnaFormUpdateRequest.getFnaFormOther()));
fnaForm.setOther(GSON.toJson(fnaFormUpdateRequest.getOther()));
return fnaForm;
}
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/FnaFormVO.java
......@@ -74,10 +74,16 @@ public class FnaFormVO implements Serializable {
private LiquidAssets liquidAssets;
/**
* 保单持有人资产
* 自住用途之房地產
*/
@Schema(description = "保单持有人资产")
private OwnerAssets ownerAssets;
@Schema(description = "自住用途之房地產")
private List<OwnerProperties> primaryResidence;
/**
* 投資房地產
*/
@Schema(description = "投資房地產")
private List<InvestmentProperties> investment;
/**
* 公司业务资料
......@@ -89,8 +95,7 @@ public class FnaFormVO implements Serializable {
* 其他问题
*/
@Schema(description = "Fna表单其他问题")
private FnaFormOther fnaFormOther;
private FnaFormOther other;
/**
* 封装类转对象
......
yd-csf-service/src/main/resources/mappers/FnaFormMapper.xml
......@@ -16,9 +16,10 @@
<result property="existingSecurityInsured" column="existing_security_insured" />
<result property="incomeExpense" column="income_expense" />
<result property="liquidAssets" column="liquid_assets" />
<result property="ownerAssets" column="owner_assets" />
<result property="primaryResidence" column="primary_residence" />
<result property="investment" column="investment" />
<result property="companyBusinessData" column="company_business_data" />
<result property="fnaFormOther" column="fna_form_other" />
<result property="other" column="other" />
<result property="fnaFormStatus" column="fna_form_status" />
<result property="remark" column="remark" />
<result property="isDeleted" column="is_deleted" />
......@@ -31,7 +32,8 @@
<sql id="Base_Column_List">
id,fna_form_biz_id,user_biz_id,agent_biz_id,customer_biz_id,personal_data,
family_members,existing_security_owner,existing_security_insured,income_expense,liquid_assets,
owner_assets,company_business_data,fna_form_other,fna_form_status,remark,
is_deleted,creator_id,updater_id,create_time,update_time
primary_residence,investment,company_business_data,other,fna_form_status,
remark,is_deleted,creator_id,updater_id,create_time,
update_time
</sql>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment