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 1/6] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=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 ServiceImpllist = 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) arr1List2.get(0)); - dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]")) + dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); + if(!arr1List2.get(1).toString().equals("[]")) + dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); + if(!arr1List2.get(2).toString().equals("[]")) + dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); + if(!arr1List2.get(3).toString().equals("[]")) + dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); + if(!arr1List2.get(4).toString().equals("[]")) + dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); + if(!arr1List2.get(5).toString().equals("[]")) + dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); + if(!arr1List2.get(6).toString().equals("[]")) + dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); + if(!arr1List2.get(7).toString().equals("[]")) + dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); + if(!arr1List2.get(8).toString().equals("[]")) + dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); + if(!arr1List2.get(9).toString().equals("[]")) + dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); + if(!arr1List2.get(10).toString().equals("[]")) + dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); + if(!arr1List2.get(11).toString().equals("[]")) + dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); + if(!arr1List2.get(12).toString().equals("[]")) + dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); + if(!arr1List2.get(13).toString().equals("[]")) + dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + } BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse(); businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo); @@ -433,20 +470,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl().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) arr1List2.get(0)); - dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]")) + dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); + if(!arr1List2.get(1).toString().equals("[]")) + dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); + if(!arr1List2.get(2).toString().equals("[]")) + dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); + if(!arr1List2.get(3).toString().equals("[]")) + dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); + if(!arr1List2.get(4).toString().equals("[]")) + dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); + if(!arr1List2.get(5).toString().equals("[]")) + dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); + if(!arr1List2.get(6).toString().equals("[]")) + dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); + if(!arr1List2.get(7).toString().equals("[]")) + dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); + if(!arr1List2.get(8).toString().equals("[]")) + dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); + if(!arr1List2.get(9).toString().equals("[]")) + dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); + if(!arr1List2.get(10).toString().equals("[]")) + dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); + if(!arr1List2.get(11).toString().equals("[]")) + dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); + if(!arr1List2.get(12).toString().equals("[]")) + dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); + if(!arr1List2.get(13).toString().equals("[]")) + dgEnclosureInfo.setMarriageCopyList((List) 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) arr1List2.get(0)); - dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]")) + dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); + if(!arr1List2.get(1).toString().equals("[]")) + dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); + if(!arr1List2.get(2).toString().equals("[]")) + dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); + if(!arr1List2.get(3).toString().equals("[]")) + dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); + if(!arr1List2.get(4).toString().equals("[]")) + dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); + if(!arr1List2.get(5).toString().equals("[]")) + dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); + if(!arr1List2.get(6).toString().equals("[]")) + dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); + if(!arr1List2.get(7).toString().equals("[]")) + dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); + if(!arr1List2.get(8).toString().equals("[]")) + dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); + if(!arr1List2.get(9).toString().equals("[]")) + dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); + if(!arr1List2.get(10).toString().equals("[]")) + dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); + if(!arr1List2.get(11).toString().equals("[]")) + dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); + if(!arr1List2.get(12).toString().equals("[]")) + dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); + if(!arr1List2.get(13).toString().equals("[]")) + dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + } //查询该业务id下对应的C角 DgMessageInvestigation messageInvestigate = this.baseMapper.selectOne(new QueryWrapper() From a7af6de58c7273a23865afa436c7d3a42110defe Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 2 Apr 2021 09:34:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=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 | 47 +++++++------------ .../DgGuaranteeAssignUserServiceImpl.java | 19 ++------ .../DgMessageInvestigationServiceImpl.java | 19 ++------ .../mapper/hrauth/RolePermissionMapper.xml | 2 +- 4 files changed, 24 insertions(+), 63 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 2470a901..855a70d9 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 @@ -253,33 +253,33 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl0){ - if(!arr1List2.get(0).toString().equals("[]")) +/* if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]"))*/ dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); - if(!arr1List2.get(1).toString().equals("[]")) dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - if(!arr1List2.get(2).toString().equals("[]")) dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - if(!arr1List2.get(3).toString().equals("[]")) dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - if(!arr1List2.get(4).toString().equals("[]")) dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - if(!arr1List2.get(5).toString().equals("[]")) dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - if(!arr1List2.get(6).toString().equals("[]")) dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - if(!arr1List2.get(7).toString().equals("[]")) dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - if(!arr1List2.get(8).toString().equals("[]")) dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - if(!arr1List2.get(9).toString().equals("[]")) dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - if(!arr1List2.get(10).toString().equals("[]")) dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - if(!arr1List2.get(11).toString().equals("[]")) dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - if(!arr1List2.get(12).toString().equals("[]")) dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - if(!arr1List2.get(13).toString().equals("[]")) dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); - } +// } BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse(); businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo); 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 83733c3d..e53ec9f9 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,36 +164,23 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl0){ - if(!arr1List2.get(0).toString().equals("[]")) +/* if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]"))*/ dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); - if(!arr1List2.get(1).toString().equals("[]")) dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - if(!arr1List2.get(2).toString().equals("[]")) dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - if(!arr1List2.get(3).toString().equals("[]")) dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - if(!arr1List2.get(4).toString().equals("[]")) dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - if(!arr1List2.get(5).toString().equals("[]")) dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - if(!arr1List2.get(6).toString().equals("[]")) dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - if(!arr1List2.get(7).toString().equals("[]")) dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - if(!arr1List2.get(8).toString().equals("[]")) dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - if(!arr1List2.get(9).toString().equals("[]")) dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - if(!arr1List2.get(10).toString().equals("[]")) dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - if(!arr1List2.get(11).toString().equals("[]")) dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - if(!arr1List2.get(12).toString().equals("[]")) dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - if(!arr1List2.get(13).toString().equals("[]")) dgEnclosureInfo.setMarriageCopyList((List) 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 5418176b..c28e4987 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,36 +238,23 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl0){ - if(!arr1List2.get(0).toString().equals("[]")) +/* if(arr1List2.size()>0){ + if(!arr1List2.get(0).toString().equals("[]"))*/ dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); - if(!arr1List2.get(1).toString().equals("[]")) dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); - if(!arr1List2.get(2).toString().equals("[]")) dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); - if(!arr1List2.get(3).toString().equals("[]")) dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); - if(!arr1List2.get(4).toString().equals("[]")) dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); - if(!arr1List2.get(5).toString().equals("[]")) dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); - if(!arr1List2.get(6).toString().equals("[]")) dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); - if(!arr1List2.get(7).toString().equals("[]")) dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); - if(!arr1List2.get(8).toString().equals("[]")) dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); - if(!arr1List2.get(9).toString().equals("[]")) dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); - if(!arr1List2.get(10).toString().equals("[]")) dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); - if(!arr1List2.get(11).toString().equals("[]")) dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); - if(!arr1List2.get(12).toString().equals("[]")) dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); - if(!arr1List2.get(13).toString().equals("[]")) dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); - } +// } //查询该业务id下对应的C角 DgMessageInvestigation messageInvestigate = this.baseMapper.selectOne(new QueryWrapper() diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml index 7dfeafea..406a66f5 100644 --- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml @@ -80,7 +80,7 @@ diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index 9a0bf792..e8df6940 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -118,4 +118,18 @@ + + + + + + + \ No newline at end of file From 68b9a8b5d057b7d3e140045cebd4e327cb156fb3 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 2 Apr 2021 16:02:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=9D=E5=90=8E=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AlRepaymentEntryServiceImpl.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java index 9eb024af..571f345b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java @@ -177,6 +177,8 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl Date: Fri, 2 Apr 2021 16:11:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=A4=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/daqing/framework/domain/crms/response/CrmsCode.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index 133ebdbb..96d28573 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -21,6 +21,7 @@ public enum CrmsCode implements ResultCode { NOT_NULL(false,20004,"上传的文件不能为空"), CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!"), CUSTOMER_NAME_REPETITION(false, 20006, "当前客户名称已存在!"), + CUSTOMER_SOCIAL_UNIFIED_CODE_REPETITION(false, 200010,"当前社会统一代码已存在!"), CUSTOMER_APPLET_IS_NULL(false, 20007,"未查询到你的认证信息,请先认证你的信息!"), CUSTOMER_APPLET_EXIST(false, 20008,"你已认证自己的信息,无需再次认证!"), CUSTOMER_APPLET_STATUS_IS_NULL(false, 20009, "当前申请贷款信息状态异常,请刷新重试!"); From dafcc60758c71de296c0f86627ec4c92650f43f7 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 2 Apr 2021 17:55:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8C=87=E6=B4=BEabc=E8=A7=92=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=B8=93=E5=91=98=E5=88=A4=E9=87=8D=E3=80=81=E5=82=AC?= =?UTF-8?q?=E6=94=B6=E5=AF=BC=E5=87=BA=E6=98=AF=E5=AE=A2=E6=88=B7=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E2=86=92=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/model/response/AlCollectionListResponse.java | 4 ++-- .../guarantee/model/response/AlCollectionResponse.java | 4 ++-- .../mapper/guarantee/DgComplianceInvestigationMapper.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionListResponse.java index 63125c7c..85eeab28 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionListResponse.java @@ -26,8 +26,8 @@ public class AlCollectionListResponse extends BaseRowModel implements Serializab @ApiModelProperty("id") private Integer id; - @ExcelProperty(value = "客户编号", index = 0) - @ApiModelProperty("客户编号") + @ExcelProperty(value = "业务编号", index = 0) + @ApiModelProperty("业务编号") private String code; @ExcelProperty(value = "客户名称", index = 1) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionResponse.java index 5d45f187..c690ffe4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlCollectionResponse.java @@ -25,8 +25,8 @@ public class AlCollectionResponse extends BaseRowModel implements Serializable { @ApiModelProperty("id") private Integer id; - @ExcelProperty(value = "客户编号", index = 0) - @ApiModelProperty("客户编号") + @ExcelProperty(value = "业务编号", index = 0) + @ApiModelProperty("业务编号") private String code; @ExcelProperty(value = "客户名称", index = 1) diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml index 1a40f3a3..b6d0df63 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -193,8 +193,8 @@