From 7a84de6f85df37008af6e87b490ad865613ebde9 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 18 Dec 2020 21:48:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmsCompanyPersonalController.java        |  2 +-
 .../impl/DgApplyAmountInfoServiceImpl.java    |  5 +++
 .../DgAssetsInvestigationServiceImpl.java     | 33 +++++++++++--------
 .../DgGuaranteeAssignUserServiceImpl.java     |  6 +++-
 .../src/main/resources/bootstrap.properties   |  5 ++-
 .../src/main/resources/bootstrap.properties   |  5 ++-
 6 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java
index 35036ca2..ee2647ae 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java
@@ -78,7 +78,7 @@ public class CrmsCompanyPersonalController {
     @ApiOperation(value = "编辑个人/企业关联人")
     public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonal crmsCompanyPersonal){
         boolean result = crmsCompanyPersonalService.updateById(crmsCompanyPersonal);
-        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+        return result ? ResponseResult.SUCCESS(crmsCompanyPersonal) : ResponseResult.FAIL();
     }
 
     /**
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index 32a1ed71..b61be868 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -396,6 +396,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id",businessApplication.getBusinessId()));
+
+        //同时往审核流程进程表新增一条记录
+        String account = dgApplyAmountInfoController.getAccount();
+        AuditProcessUtil.save(businessApplication.getBusinessId(),account,"担保业务员","",1,"","","");
+
         //附件新增
         return dgEnclosureInfoMapper.insert(dgEnclosureInfo);
     }
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 8c1d701c..06b2a305 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
@@ -164,22 +164,23 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         //根据业务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);
+        if(assetsInvestigation != null){
+            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,assetsInvestigationRes);
-            BeanUtils.copyProperties(assetsInvestigationRes,assetsResponse);
+            AssetsInvestigationResponse assetsInvestigationRes = new AssetsInvestigationResponse();
+            if(assetsInvestigation != null){
+                BeanUtils.copyProperties(assetsInvestigation,assetsInvestigationRes);
+                BeanUtils.copyProperties(assetsInvestigationRes,assetsResponse);
+            }
         }
-
         //根据业务id查询评估价值List
 /*        List<DgAssetsAssessmentAssetsLog> assessmentlist = dgAssetsAssessmentAssetsLogMapper.selectList(
                 new QueryWrapper<DgAssetsAssessmentAssetsLog>().eq("business_id",assetsResponse.getBusinessId()));
@@ -423,8 +424,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }else{
             deptName = "资产部分管领导";
         }
-        String remark = Arrays.toString(approvalAssetsRequest.getRemark());//补充调查原因
+        String remark1 = Arrays.toString(approvalAssetsRequest.getRemark());//补充调查原因
+        String remark = remark1.replace("[","").replace("]","");
         String otherRemark = approvalAssetsRequest.getOtherRemark();//其他原因
+        if(otherRemark == null){
+            otherRemark = "";
+        }
         String reason = remark+otherRemark;
         String loanMoney = approvalAssetsRequest.getAmount().toString();//金额
         String loanTerm = approvalAssetsRequest.getTerm();//期限
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index f33e3ac0..de106d41 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -506,8 +506,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         } else {
             deptName = "担保部分管领导";
         }
-        String remark = Arrays.toString(approvalGuaranteeRequest.getRemark());//补充调查原因
+        String remark1 = Arrays.toString(approvalGuaranteeRequest.getRemark());//补充调查原因
+        String remark = remark1.replace("[","").replace("]","");
         String otherRemark = approvalGuaranteeRequest.getOtherRemark();//其他原因
+        if(otherRemark == null){
+            otherRemark = "";
+        }
         String reason = remark+otherRemark;
         String loanMoney = approvalGuaranteeRequest.getAmount().toString();//金额
         String loanTerm = approvalGuaranteeRequest.getTerm();//期限
diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties
index 2a15ed3d..970487fe 100644
--- a/dq-financial-hrms/src/main/resources/bootstrap.properties
+++ b/dq-financial-hrms/src/main/resources/bootstrap.properties
@@ -64,4 +64,7 @@ spring.servlet.multipart.max-request-size=10MB
 #spring.redis.jedis.pool.max-active=8
 #spring.redis.jedis.pool.max-wait=-1
 #spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.redis.jedis.pool.min-idle=0
+#
+#spring.servlet.multipart.max-file-size=10MB
+#spring.servlet.multipart.max-request-size=10MB
\ No newline at end of file
diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties
index 6ab3e58c..b598d630 100644
--- a/dq-govern-gateway/src/main/resources/bootstrap.properties
+++ b/dq-govern-gateway/src/main/resources/bootstrap.properties
@@ -37,4 +37,7 @@ spring.redis.jedis.pool.min-idle=0
 #spring.redis.jedis.pool.max-active=8
 #spring.redis.jedis.pool.max-wait=-1
 #spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.redis.jedis.pool.min-idle=0
+#
+#spring.servlet.multipart.max-file-size=10MB
+#spring.servlet.multipart.max-request-size=10MB
\ No newline at end of file