From 7686736a02be82a7185fa8c5f1cf707b8deb32de Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 1 Apr 2021 16:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=BF=94=E5=9B=9E=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DgApplyAmountInfoServiceImpl.java    | 108 +++++++++++-------
 .../DgGuaranteeAssignUserServiceImpl.java     |  44 ++++---
 .../DgMessageInvestigationServiceImpl.java    |  44 ++++---
 3 files changed, 126 insertions(+), 70 deletions(-)

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 aa89198f..2470a901 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
@@ -204,20 +204,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(dgApplyAmountInfo.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
+        getEnclosure(businessApplication,dgEnclosureInfo);
         dgEnclosureInfoMapper.insert(dgEnclosureInfo);
 
         //根据企业id查询企业详情
@@ -264,6 +251,39 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         return 1;
     }
 
+    public void getEnclosure(BusinessApplicationRequest businessApplication,DgEnclosureInfo dgEnclosureInfo){
+        //上传附件信息
+        if(businessApplication.getBusinessLicense()!=null)
+            dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        if(businessApplication.getLegalCardCopy()!=null)
+            dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        if(businessApplication.getMarriageCopy()!=null)
+            dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        if(businessApplication.getLegalCopy()!=null)
+            dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+        if(businessApplication.getCompanyConstitution()!=null)
+            dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
+        if(businessApplication.getAccountingFirm()!=null)
+            dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        if(businessApplication.getCompanyCredit()!=null)
+            dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
+        if(businessApplication.getCreditReport()!=null)
+            dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+        if(businessApplication.getCertificateAuthorization()!=null)
+            dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+        if(businessApplication.getTaxCertificate()!=null)
+            dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+        if(businessApplication.getMeetingMinutes()!=null)
+            dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+        if(businessApplication.getAssessmentReport()!=null)
+            dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+        if(businessApplication.getConversationSummary()!=null)
+            dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
+        if(businessApplication.getInspectionPhotos()!=null)
+            dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
+
+    }
+
     @Override
     public PageUtils queryPage(Integer page, Integer size, String CustomerNumberOrName) {
         //分页参数
@@ -304,6 +324,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgApplyAmountList.getBusinessId());
 
         List<String>list = new ArrayList<>();
+        System.out.println(dgEnclosureInfo.getAccountingFirm());
         list.add(dgEnclosureInfo.getAccountingFirm());
         list.add(dgEnclosureInfo.getAssessmentReport());
         list.add(dgEnclosureInfo.getBusinessLicense());
@@ -332,20 +353,36 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 arr1List2.add(i,null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))
+            dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+            if(!arr1List2.get(1).toString().equals("[]"))
+            dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(2).toString().equals("[]"))
+            dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+            if(!arr1List2.get(3).toString().equals("[]"))
+            dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+            if(!arr1List2.get(4).toString().equals("[]"))
+            dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+            if(!arr1List2.get(5).toString().equals("[]"))
+            dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+            if(!arr1List2.get(6).toString().equals("[]"))
+            dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+            if(!arr1List2.get(7).toString().equals("[]"))
+            dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+            if(!arr1List2.get(8).toString().equals("[]"))
+            dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+            if(!arr1List2.get(9).toString().equals("[]"))
+            dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+            if(!arr1List2.get(10).toString().equals("[]"))
+            dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+            if(!arr1List2.get(11).toString().equals("[]"))
+            dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+            if(!arr1List2.get(12).toString().equals("[]"))
+            dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+            if(!arr1List2.get(13).toString().equals("[]"))
+            dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        }
 
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
@@ -433,20 +470,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(businessApplication.getBusinessId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
+        getEnclosure(businessApplication,dgEnclosureInfo);
 
         //根据业务id查询对应的附件信息
         DgEnclosureInfo dgEnclosureInfo1 = dgEnclosureInfoMapper.selectOne(new QueryWrapper<DgEnclosureInfo>().eq("business_id", businessApplication.getBusinessId()));
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 ad0b310e..83733c3d 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
@@ -164,20 +164,36 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 arr1List2.add(i, null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))
+                dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+            if(!arr1List2.get(1).toString().equals("[]"))
+                dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(2).toString().equals("[]"))
+                dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+            if(!arr1List2.get(3).toString().equals("[]"))
+                dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+            if(!arr1List2.get(4).toString().equals("[]"))
+                dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+            if(!arr1List2.get(5).toString().equals("[]"))
+                dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+            if(!arr1List2.get(6).toString().equals("[]"))
+                dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+            if(!arr1List2.get(7).toString().equals("[]"))
+                dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+            if(!arr1List2.get(8).toString().equals("[]"))
+                dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+            if(!arr1List2.get(9).toString().equals("[]"))
+                dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+            if(!arr1List2.get(10).toString().equals("[]"))
+                dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+            if(!arr1List2.get(11).toString().equals("[]"))
+                dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+            if(!arr1List2.get(12).toString().equals("[]"))
+                dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+            if(!arr1List2.get(13).toString().equals("[]"))
+                dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        }
 
 
         //查询担保部经理审核的金额和期限
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
index 14f5e6d6..5418176b 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
@@ -238,20 +238,36 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 arr1List2.add(i,null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))
+                dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+            if(!arr1List2.get(1).toString().equals("[]"))
+                dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(2).toString().equals("[]"))
+                dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+            if(!arr1List2.get(3).toString().equals("[]"))
+                dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+            if(!arr1List2.get(4).toString().equals("[]"))
+                dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+            if(!arr1List2.get(5).toString().equals("[]"))
+                dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+            if(!arr1List2.get(6).toString().equals("[]"))
+                dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+            if(!arr1List2.get(7).toString().equals("[]"))
+                dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+            if(!arr1List2.get(8).toString().equals("[]"))
+                dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+            if(!arr1List2.get(9).toString().equals("[]"))
+                dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+            if(!arr1List2.get(10).toString().equals("[]"))
+                dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+            if(!arr1List2.get(11).toString().equals("[]"))
+                dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+            if(!arr1List2.get(12).toString().equals("[]"))
+                dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+            if(!arr1List2.get(13).toString().equals("[]"))
+                dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        }
 
         //查询该业务id下对应的C角
         DgMessageInvestigation messageInvestigate = this.baseMapper.selectOne(new QueryWrapper<DgMessageInvestigation>()