From c4691be6690b8cf1234ecca0ea7491175709e120 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Fri, 9 Apr 2021 17:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=84=E9=80=81=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DgCopyUserController.java      |  2 +-
 .../controller/DgEfficiencyController.java    |  5 ++---
 .../guarantee/mapper/DgCopyUserMapper.java    |  2 ++
 .../guarantee/service/IDgCopyUserService.java |  2 ++
 .../service/impl/DgCopyForServiceImpl.java    |  9 +--------
 .../service/impl/DgCopyUserServiceImpl.java   |  6 +++++-
 .../mapper/guarantee/DgCopyUserMapper.xml     | 20 +++++++++++++++++++
 7 files changed, 33 insertions(+), 13 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 fa1eefc8..8fbc6c75 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
@@ -43,7 +43,7 @@ public class DgCopyUserController {
     @PostMapping("/queryCopyForMe")
     public R queryCopyForMe(@RequestBody CopyForMeRequest copyForMeRequest){
         List<CopyForMeResponse> copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest);
-        return R.ok().data("copyForMeList",copyForMeList).data("total",copyForMeList.size());
+        return R.ok().data("copyForMeList",copyForMeList).data("total",copyUserService.queryTotal(copyForMeRequest));
     }
 
     @Log(detail = "导出抄送我的列表",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)
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 9250c312..261588e8 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
@@ -206,10 +206,9 @@ public class DgEfficiencyController {
         String userId = DgApplyAmountInfoController.getUserId();
         CopyForMeRequest copyForMeRequest = new CopyForMeRequest();
         copyForMeRequest.setUserId(Integer.parseInt(userId));
-        List<CopyForMeResponse> copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest);
-        int size = copyForMeList.size();
+        Integer total = copyUserService.queryTotal(copyForMeRequest);
         NumResponse numResponse = new NumResponse();
-        numResponse.setCopySendNum(size);
+        numResponse.setCopySendNum(total);
         //转换任务节点，并统计操作状态个数
         responseList.forEach(personalEfficiencyListResponse -> {
             //耗时为空，默认为0
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java
index 9aeb4dbe..019de4b6 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgCopyUserMapper.java
@@ -21,4 +21,6 @@ import java.util.List;
 public interface DgCopyUserMapper extends BaseMapper<DgCopyUser> {
 
     List<CopyForMeResponse> selectCopyForMe(CopyForMeRequest copyForMeRequest);
+
+    Integer selectCopyForMeTotal(CopyForMeRequest copyForMeRequest);
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java
index e190d190..c3df2163 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyUserService.java
@@ -22,5 +22,7 @@ public interface IDgCopyUserService extends IService<DgCopyUser> {
 
     List<CopyForMeResponse> queryCopyForMe(CopyForMeRequest copyForMeRequest);
 
+    Integer queryTotal(CopyForMeRequest copyForMeRequest);
+
     void exportCopyForMe(HttpServletResponse response) throws IOException;
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java
index d32e2a77..3d225d55 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java
@@ -1,26 +1,19 @@
 package com.daqing.financial.guarantee.service.impl;
 
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.mapper.DgCopyForMapper;
 import com.daqing.financial.guarantee.mapper.DgCopyUserMapper;
 import com.daqing.financial.guarantee.mapper.DgProcessUserMapper;
 import com.daqing.financial.guarantee.service.IDgCopyForService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.financial.guarantee.service.IDgCopyUserService;
-import com.daqing.financial.guarantee.service.IDgProcessUserService;
-import com.daqing.financial.guarantee.util.ImgUtil;
 import com.daqing.framework.domain.guarantee.DgCopyFor;
 import com.daqing.framework.domain.guarantee.DgCopyUser;
 import com.daqing.framework.domain.guarantee.DgProcessUser;
-import com.daqing.framework.model.response.PromptSuccess;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
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 024304b6..42a2a0d6 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
@@ -119,12 +119,16 @@ public class DgCopyUserServiceImpl extends ServiceImpl<DgCopyUserMapper, DgCopyU
                     copyForMeResponse.setTaskNode(converter);
                 }
             });
-
         }
 
         return copyForMeResponseList;
     }
 
+    @Override
+    public Integer queryTotal(CopyForMeRequest copyForMeRequest) {
+        return baseMapper.selectCopyForMeTotal(copyForMeRequest);
+    }
+
     /**
      * 获取当前登录用户信息
      */
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml
index 4263e66e..9728365b 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgCopyUserMapper.xml
@@ -57,4 +57,24 @@
         limit #{page},#{size}
     </select>
 
+    <select id="selectCopyForMeTotal" parameterType="com.daqing.financial.guarantee.model.request.CopyForMeRequest"
+            resultType="integer">
+        SELECT count(1)
+        FROM
+        dg_copy_user cu
+        JOIN dg_copy_for cf ON cu.copy_id = cf.id
+        LEFT JOIN dg_apply_amount_info aai ON cf.business_id = aai.id
+        LEFT JOIN crms_company_customer ccc ON aai.company_id = ccc.id
+        left join dg_loan_committee_consider lcc on cf.business_id = lcc.business_id
+        LEFT JOIN crms_customer cc ON ccc.customer_id = cc.id
+        LEFT JOIN dg_business_process_status bps ON bps.business_id = aai.id
+        WHERE cu.user_id = #{userId}
+        <if test="startTime != null and endTime != ''">
+            AND cf.update_time BETWEEN #{startTime} and #{endTime}
+        </if>
+        <if test="clientName != null and clientName != ''">
+            AND cc.name LIKE '%' #{clientName} '%'
+        </if>
+    </select>
+
 </mapper>