From e6f13ca0349c43f4a09b36430b9a872441a1406f Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Wed, 16 Dec 2020 16:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=AC=A1=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgComplianceInvestigationMapper.java | 2 + .../mapper/DgLoanCommitteeConsiderMapper.java | 2 + .../response/GuaranteeDetailResponse.java | 3 ++ .../DgComplianceInvestigationServiceImpl.java | 28 +++++++----- .../DgLoanCommitteeConsiderServiceImpl.java | 9 ++-- .../DgWorkConferenceConsiderServiceImpl.java | 45 ++++++++++--------- .../src/main/resources/bootstrap.properties | 2 +- .../DgComplianceInvestigationMapper.xml | 13 +++++- .../DgLoanCommitteeConsiderMapper.xml | 13 +++++- .../DgWorkConferenceConsiderMapper.xml | 8 +++- .../model/response/PromptSuccess.java | 4 +- 11 files changed, 85 insertions(+), 44 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index 5db613b1..ce6455be 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -71,6 +71,8 @@ public interface DgComplianceInvestigationMapper extends BaseMapper 0) { // 表示为法规部领导驳回的数据,先更新审批状态为审核中 Boolean result2 = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(), StatusCode.SP_IN_REVIEW); @@ -494,6 +496,12 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl 0) { // 当前贷审会的操作状态为驳回,表示为担保函驳回数据,改变担保函的法规部经理的操作状态为待处理,审核状态为审核中 result1 = this.getBaseMapper().updateGuaranteeLetterAssignUser( this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), @@ -138,7 +140,6 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId)); List dgWorkConferencePOS = list.getRecords(); - System.out.println(dgWorkConferencePOS); - Integer[] userIds = new Integer[dgWorkConferencePOS.size() * 5]; - // 获取所有的userId - for (int i = 0; i < userIds.length; i += 5) { - for (int j = i / 5; j < i / 5 + 1; j++) { - userIds[i] = dgWorkConferencePOS.get(j).getAUserId(); - userIds[i + 1] = dgWorkConferencePOS.get(j).getBUserId(); - userIds[i + 2] = dgWorkConferencePOS.get(j).getIUserId(); - userIds[i + 3] = dgWorkConferencePOS.get(j).getAssUserId(); - userIds[i + 4] = dgWorkConferencePOS.get(j).getMUserId(); - } - } - // 根据userId获取对应的员工姓名 - ResponseResult> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); List listResponse = new ArrayList<>(); - if (responseResult.getData() != null) { - // 将对应的userId转换为name - listResponse = this.transitionUserName(dgWorkConferencePOS, responseResult.getData()); - } else { - for (DgWorkConferencePO workConferencePO : dgWorkConferencePOS) { - DgWorkConferenceResponse workConference = new DgWorkConferenceResponse(); - BeanUtils.copyProperties(workConferencePO, workConference); - listResponse.add(workConference); + if (dgWorkConferencePOS != null && dgWorkConferencePOS.size() != 0) { + Integer[] userIds = new Integer[dgWorkConferencePOS.size() * 5]; + // 获取所有的userId + for (int i = 0; i < userIds.length; i += 5) { + for (int j = i / 5; j < i / 5 + 1; j++) { + userIds[i] = dgWorkConferencePOS.get(j).getAUserId(); + userIds[i + 1] = dgWorkConferencePOS.get(j).getBUserId(); + userIds[i + 2] = dgWorkConferencePOS.get(j).getIUserId(); + userIds[i + 3] = dgWorkConferencePOS.get(j).getAssUserId(); + userIds[i + 4] = dgWorkConferencePOS.get(j).getMUserId(); + } + } + // 根据userId获取对应的员工姓名 + ResponseResult> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); + if (responseResult.getData() != null) { + // 将对应的userId转换为name + listResponse = this.transitionUserName(dgWorkConferencePOS, responseResult.getData()); + } else { + for (DgWorkConferencePO workConferencePO : dgWorkConferencePOS) { + DgWorkConferenceResponse workConference = new DgWorkConferenceResponse(); + BeanUtils.copyProperties(workConferencePO, workConference); + listResponse.add(workConference); + } } } // 分页属性复制并返回 diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 14fd29f4..d0e675df 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -39,7 +39,7 @@ spring.servlet.multipart.max-request-size=10MB # 单个文件的最大值 spring.servlet.multipart.max-file-size=10MB -# 正式环境（prod） +#正式环境（prod） #服务名称 #spring.application.name=dq-financial-guarantee ##配置中心地址 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 a67906cb..c1c63922 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -23,8 +23,10 @@ FROM dg_compliance_investigation AS i LEFT JOIN dg_apply_amount_info AS a ON a.id = i.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON c.id = cc.customer_id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 @@ -50,8 +52,10 @@ FROM dg_compliance_investigation AS i LEFT JOIN dg_apply_amount_info AS a ON a.id = i.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON c.id = cc.customer_id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 @@ -163,6 +167,11 @@ SELECT COUNT(id) FROM dg_work_conference_consider WHERE business_id = #{businessId} AND role_id = #{roleId} + + + UPDATE dg_work_conference_consider SET audit_status = #{auditStatus},operation_status = #{operationStatus} diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index b2f3e12d..328c1ce6 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -26,8 +26,10 @@ FROM dg_loan_committee_consider AS l LEFT JOIN dg_apply_amount_info AS a ON a.id = l.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON cc.customer_id = c.id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 @@ -49,8 +51,10 @@ FROM dg_loan_committee_consider AS l LEFT JOIN dg_apply_amount_info AS a ON a.id = l.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON cc.customer_id = c.id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 @@ -142,4 +146,9 @@ UPDATE dg_loan_committee_consider SET consider_id = #{userId} WHERE id = #{id} + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index 428c44f4..e84a9e36 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -22,8 +22,10 @@ FROM dg_work_conference_consider AS w LEFT JOIN dg_apply_amount_info AS a ON a.id = w.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON cc.customer_id = c.id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id LEFT JOIN (SELECT business_id,SUM(CASE role_id WHEN 59 THEN emp_id ELSE 0 END) AS A, @@ -59,8 +61,10 @@ FROM dg_work_conference_consider AS w LEFT JOIN dg_apply_amount_info AS a ON a.id = w.business_id + LEFT JOIN crms_company_customer AS cc + ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON a.company_id = c.id + ON cc.customer_id = c.id LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id LEFT JOIN (SELECT business_id,SUM(CASE role_id WHEN 59 THEN emp_id ELSE 0 END) AS A, diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 805ed9e4..d5d68662 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -92,5 +92,7 @@ public class PromptSuccess { public static final String DSH_NAME = "贷审会"; // 贷审会 - public static final String DB_AB_NAME = "担保部A/B角"; // 担保部A/B角 + public static final String DB_A_NAME = "担保部A角"; // 担保部A角 + + public static final String DB_B_NAME = "担保部B角"; // 担保部B角 }