From 5f33bd265503dc01a1c3c0e033efffa917396848 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Thu, 22 Apr 2021 16:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=95=88=E7=8E=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonalEfficiencyListResponse.java       |  8 ++++++
 .../service/impl/DgEfficiencyServiceImpl.java | 27 +++++++++++++++++--
 .../domain/guarantee/po/StatusPO.java         |  6 +++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java
index ca8a1d2e..5b009a83 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java
@@ -21,6 +21,14 @@ public class PersonalEfficiencyListResponse {
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "详情id")
+    private Integer detailId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     @ExcelIgnore
     @ApiModelProperty(value = "提单人")
     private Integer applicantId;
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
index 72796aad..126f68cb 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
@@ -227,8 +227,6 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
 
     /**
      * 查询审批数目的值的数组
-     *
-     * @return
      */
     @Override
     public Map approvalNum() {
@@ -270,6 +268,9 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         return applyAmountInfoMapper.getTodayBusinessCount(dateFormat.format(new Date()));
     }
 
+    /**
+     * 个人效率记录
+     */
     @Override
     public List<PersonalEfficiencyListResponse> queryPersonalEfficiencyList() {
         int size = 100;
@@ -308,6 +309,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = businessApplicationListResponse.getStatus();
                     Integer operatingStatus = businessApplicationListResponse.getOperatingStatus();
                     Integer businessStatus = businessApplicationListResponse.getBusinessStatus();
+                    statusPO.setDetailId(businessApplicationListResponse.getId());
+                    statusPO.setRoleId(businessApplicationListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setName(name);
                     statusPO.setOperatingStatus(operatingStatus);
@@ -330,6 +333,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     String name = guaranteeListResponse.getName();
                     Integer operatingStatus = guaranteeListResponse.getOperatingStatus();
                     Integer businessStatus = guaranteeListResponse.getBusinessStatus();
+                    statusPO.setDetailId(guaranteeListResponse.getId());
+                    statusPO.setRoleId(guaranteeListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(2);
@@ -352,6 +357,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     String name = assetsInvestigationListResponse.getName();
                     Integer operatingStatus = assetsInvestigationListResponse.getOperatingStatus();
                     Integer businessStatus = assetsInvestigationListResponse.getBusinessStatus();
+                    statusPO.setDetailId(assetsInvestigationListResponse.getId());
+                    statusPO.setRoleId(assetsInvestigationListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(3);
@@ -374,6 +381,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     String name = messageInvestigationListResponse.getName();
                     Integer operatingStatus = messageInvestigationListResponse.getOperatingStatus();
                     Integer businessStatus = messageInvestigationListResponse.getBusinessStatus();
+                    statusPO.setDetailId(messageInvestigationListResponse.getId());
+                    statusPO.setRoleId(messageInvestigationListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(4);
@@ -397,6 +406,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = dgComplianceInvestigationResponse.getAuditStatus();
                     Integer operatingStatus = dgComplianceInvestigationResponse.getOperationStatus();
                     Integer businessStatus = dgComplianceInvestigationResponse.getBusinessStatus();
+                    statusPO.setDetailId(dgComplianceInvestigationResponse.getIId());
+                    statusPO.setRoleId(dgComplianceInvestigationResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(5);
@@ -418,6 +429,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = dgWorkConferencePO.getAuditStatus();
                     Integer operatingStatus = dgWorkConferencePO.getOperationStatus();
                     Integer businessStatus = dgWorkConferencePO.getBusinessStatus();
+                    statusPO.setDetailId(dgWorkConferencePO.getId());
+                    statusPO.setRoleId(dgWorkConferencePO.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(6);
@@ -439,6 +452,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     String name = dgLoanCommitteeConsiderResponse.getName();
                     Integer operatingStatus = dgLoanCommitteeConsiderResponse.getOperatingStatus();
                     Integer businessStatus = dgLoanCommitteeConsiderResponse.getBusinessStatus();
+                    statusPO.setDetailId(dgLoanCommitteeConsiderResponse.getId());
+                    statusPO.setRoleId(dgLoanCommitteeConsiderResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(7);
@@ -461,6 +476,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = guaranteeLetterListResponse.getStatus();
                     Integer operatingStatus = guaranteeLetterListResponse.getOperatingStatus();
                     Integer businessStatus = guaranteeLetterListResponse.getBusinessStatus();
+                    statusPO.setDetailId(guaranteeLetterListResponse.getId());
+                    statusPO.setRoleId(guaranteeLetterListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(8);
@@ -483,6 +500,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = paymentConfirmationListResponse.getStatus();
                     Integer operatingStatus = paymentConfirmationListResponse.getOperatingStatus();
                     Integer businessStatus = paymentConfirmationListResponse.getBusinessStatus();
+                    statusPO.setDetailId(paymentConfirmationListResponse.getId());
+                    statusPO.setRoleId(paymentConfirmationListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(9);
@@ -505,6 +524,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     Integer status = loanNoticeListResponse.getStatus();
                     Integer operatingStatus = loanNoticeListResponse.getOperatingStatus();
                     Integer businessStatus = loanNoticeListResponse.getBusinessStatus();
+                    statusPO.setDetailId(loanNoticeListResponse.getId());
+                    statusPO.setRoleId(loanNoticeListResponse.getRoleId());
                     statusPO.setBusinessStatus(businessStatus);
                     statusPO.setOperatingStatus(operatingStatus);
                     statusPO.setProcessId(10);
@@ -530,6 +551,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             Date createTime = dgApplyAmountInfo.getCreateTime();
             //提单人id
             Integer presenterId = dgApplyAmountInfo.getPresenterId();
+            efficiencyListResponse.setDetailId(po.getDetailId());
+            efficiencyListResponse.setRoleId(po.getRoleId());
             efficiencyListResponse.setOperatingStatus(operatingStatus);
             efficiencyListResponse.setApproveStatus(status);
             efficiencyListResponse.setBusinessStatus(businessStatus);
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java
index dce15077..605c356d 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java
@@ -13,6 +13,12 @@ import lombok.ToString;
 @ToString
 public class StatusPO {
 
+    @ApiModelProperty(value = "详情id")
+    private Integer detailId;
+
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     @ApiModelProperty("客户名称")
     private String name;