资产部bug修复

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

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;
+
+/**
+ * <p>
+ * 资产调查
+ * </p>
+ *
+ * @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;
+}

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<String> remarkList;
+
     /**
      * 其他原因
      */

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java

@@ -150,25 +150,35 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     public AssetsDetailResponse assetsDetail(Integer id) {
         //根据主键id查询资产调查详情
         DgAssetsInvestigationResponse assetsResponse = this.getBaseMapper().selectInfoById(id);
-        String assetsAmount=assetsResponse.getAssetsAmount();
-        if(assetsAmount != null){
-            if(assetsAmount.length()>0){
-                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<String> demoList = Arrays.asList(arry);
-                assetsResponse.setAssetsAmountList(demoList);
+                assetsResponse.setRemarkList(demoList);
             }
         }
 
-        //新增代码，未测试--------------------------------------------------------
         //根据业务id以及type为1查询资产详细
         DgAssetsInvestigation assetsInvestigation = this.baseMapper.selectOne(new QueryWrapper<DgAssetsInvestigation>()
                 .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<String> 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<DgAssetsAssessmentAssetsLog> assessmentlist = dgAssetsAssessmentAssetsLogMapper.selectList(