diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index 58a12085..9eae9596 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -31,7 +31,7 @@ spring.redis.jedis.pool.min-idle=0 # 正式环境(prod) #服务名称 #spring.application.name=dq-financial-crms -##配置中心地址 +###配置中心地址 #spring.cloud.nacos.config.server-addr=120.78.127.12:8848 #spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd ##spring.cloud.nacos.config.group=prod diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationResponse.java new file mode 100644 index 00000000..46f9d821 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsInvestigationResponse.java @@ -0,0 +1,79 @@ +package com.daqing.financial.guarantee.model.response; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 资产调查 + *

+ * + * @author Qyq + * @since 2020-11-23 + */ +@Data +@TableName("dg_assets_investigation") +public class AssetsInvestigationResponse implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 资产评估报告(名称) + */ + private String assetsName; + + /** + * 资产评估报告编号 + */ + private String assetsCode; + + /** + * 评估日期 + */ + private Date assetsTime; + + /** + * 评估价值 + */ + private String assetsAmount; + + /** + * 合计 + */ + private BigDecimal amountSum; + + /** + * 审计报告(名称) + */ + private String auditName; + + /** + * 审计编号 + */ + private String auditCode; + + /** + * 审计日期 + */ + private Date auditTime; + + /** + * 审计价值(万元) + */ + private BigDecimal auditAmount; + + /** + * 反担保措施 + */ + private String guaranteeMeasures; + + /** + * 附件 + */ + private String file; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java index b8306f07..46d4e79a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgAssetsInvestigationResponse.java @@ -150,6 +150,8 @@ public class DgAssetsInvestigationResponse implements Serializable { */ private String remark; + private List remarkList; + /** * 其他原因 */ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 8ef88598..e9ddddeb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java @@ -150,25 +150,35 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl0){ - String a = assetsAmount.substring(1,assetsAmount.length()-1); + + String remarks = assetsResponse.getRemark(); + if(remarks != null){ + if(remarks.length()>0){ + String a = remarks.substring(1,remarks.length()-1); String arry[]=a.split(","); List demoList = Arrays.asList(arry); - assetsResponse.setAssetsAmountList(demoList); + assetsResponse.setRemarkList(demoList); } } - //新增代码,未测试-------------------------------------------------------- //根据业务id以及type为1查询资产详细 DgAssetsInvestigation assetsInvestigation = this.baseMapper.selectOne(new QueryWrapper() .eq("business_id", assetsResponse.getBusinessId()).eq("type", 1)); + String assetsAmounts=assetsInvestigation.getAssetsAmount(); + if(assetsAmounts != null){ + if(assetsAmounts.length()>0){ + String a = assetsAmounts.substring(1,assetsAmounts.length()-1); + String arry[]=a.split(","); + List demoList = Arrays.asList(arry); + assetsResponse.setAssetsAmountList(demoList); + } + } + AssetsInvestigationResponse assetsInvestigationRes = new AssetsInvestigationResponse(); if(assetsInvestigation != null){ - BeanUtils.copyProperties(assetsInvestigation,assetsResponse); + BeanUtils.copyProperties(assetsInvestigation,assetsInvestigationRes); + BeanUtils.copyProperties(assetsInvestigationRes,assetsResponse); } - //结束--------------------------------------------------------------------- //根据业务id查询评估价值List /* List assessmentlist = dgAssetsAssessmentAssetsLogMapper.selectList(