From 020cc9077842a0f29ffc11dfc0339413740116fc Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Wed, 31 Mar 2021 18:07:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgEfficiencyController.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 0d65a1d3..754524f6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -22,6 +22,7 @@ import com.daqing.framework.utils.excel.EasyExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -154,27 +155,22 @@ public class DgEfficiencyController { numResponse.setCopySendNum(size); //转换任务节点，并统计操作状态个数 responseList.forEach(personalEfficiencyListResponse -> { + //提单人为空，默认赋值客户 + if (StringUtils.isEmpty(personalEfficiencyListResponse.getApplicant())){ + personalEfficiencyListResponse.setApplicant("客户"); + } String taskNode = personalEfficiencyListResponse.getTaskNode(); if (taskNode != null) { String converter = TaskNodeUtil.converter(taskNode); personalEfficiencyListResponse.setTaskNode(converter); } if (personalEfficiencyListResponse.getOperatingStatus() != null) { - switch (personalEfficiencyListResponse.getOperatingStatus()) { - case 0: - numResponse.setInitiateNum(numResponse.getInitiateNum() + 1); - break; - case 1: - numResponse.setPendingNum(numResponse.getPendingNum() + 1); - break; - case 2: - numResponse.setProcessedNum(numResponse.getProcessedNum() + 1); - break; - default: - numResponse.setInitiateNum(0); - numResponse.setPendingNum(0); - numResponse.setProcessedNum(0); - break; + if (personalEfficiencyListResponse.getOperatingStatus()==0){ + numResponse.setInitiateNum(numResponse.getInitiateNum() + 1); + }else if (personalEfficiencyListResponse.getOperatingStatus()==1){ + numResponse.setPendingNum(numResponse.getPendingNum() + 1); + }else if (personalEfficiencyListResponse.getOperatingStatus()==2){ + numResponse.setProcessedNum(numResponse.getProcessedNum() + 1); } } }); From 63e3d8394884a38355608af072aa045c4b4851bc Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Thu, 1 Apr 2021 11:35:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgCopyUserController.java | 5 +++++ .../controller/DgEfficiencyController.java | 21 ++++++++++++++++++- .../model/response/CopyForMeResponse.java | 12 +++++------ .../service/impl/DgCopyUserServiceImpl.java | 10 ++++----- .../mapper/guarantee/DgCopyUserMapper.xml | 1 + 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java index c8cc196a..de1b72a2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java @@ -12,6 +12,7 @@ import com.daqing.framework.enums.OperationUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,6 +45,10 @@ public class DgCopyUserController { List copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest); //转换任务节点 copyForMeList.forEach(copyForMeResponse -> { + //提单人为空，默认赋值客户 + if (StringUtils.isEmpty(copyForMeResponse.getApplicant())){ + copyForMeResponse.setApplicant("客户"); + } String taskNode = copyForMeResponse.getTaskNode(); if (taskNode != null) { String converter = TaskNodeUtil.converter(taskNode); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 754524f6..c35a7c14 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -19,6 +19,7 @@ import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.excel.EasyExcelUtil; +import com.daqing.framework.xss.SQLFilter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -34,6 +35,7 @@ import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 流程效率 @@ -155,6 +157,10 @@ public class DgEfficiencyController { numResponse.setCopySendNum(size); //转换任务节点，并统计操作状态个数 responseList.forEach(personalEfficiencyListResponse -> { + //耗时为空，默认为0 + if (StringUtils.isEmpty(personalEfficiencyListResponse.getTimeConsuming())){ + personalEfficiencyListResponse.setTimeConsuming("0天0小时0分钟"); + } //提单人为空，默认赋值客户 if (StringUtils.isEmpty(personalEfficiencyListResponse.getApplicant())){ personalEfficiencyListResponse.setApplicant("客户"); @@ -234,7 +240,20 @@ public class DgEfficiencyController { } } } - return R.ok().data("responseList", responseList).data("statistics", numResponse); + //按时间降序排列 + List collect = responseList.stream().sorted((o1, o2) -> { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date dt1 = format.parse(o1.getApplicationDate()); + Date dt2 = format.parse(o2.getApplicationDate()); + // 默认降序 + return Long.compare(dt2.getTime(), dt1.getTime()); + } catch (Exception e) { + e.printStackTrace(); + } + return 0; + }).collect(Collectors.toList()); + return R.ok().data("responseList", collect).data("statistics", numResponse); } public static long getLongDate(String stringDate) { diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java index f5a2d200..2bfa65eb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java @@ -41,17 +41,17 @@ public class CopyForMeResponse { @ExcelProperty(value = "任务节点",index = 3,converter = TaskNodeConverter.class) private String taskNode; - @ApiModelProperty("审批人") - @ExcelProperty(value = "审批人",index = 4) - private String approve; + // @ApiModelProperty("审批人") + // @ExcelProperty(value = "审批人",index = 4) + // private String approve; - @ApiModelProperty("审批时间") - @ExcelProperty(value = "审批时间",index = 5) + @ApiModelProperty("完成时间") + @ExcelProperty(value = "完成时间",index = 4) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String approveDate; @ApiModelProperty("业务状态") - @ExcelProperty(value = "业务状态",index = 6,converter = BusinessStatusConverter.class) + @ExcelProperty(value = "业务状态",index = 5,converter = BusinessStatusConverter.class) private Integer businessStatus; @ExcelIgnore diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java index a2527fab..1ad6e695 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyUserServiceImpl.java @@ -101,11 +101,11 @@ public class DgCopyUserServiceImpl extends ServiceImpl AND cc.name LIKE '%' #{clientName} '%' + order by aai.create_time desc 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 3/4] =?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 4/4] =?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 @@