From 04f4c8c21b835a79bb52d2db8d2e6613747f2ac7 Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Fri, 26 Mar 2021 17:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=89=B9=E6=9C=89=E4=BF=A1=E6=81=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D;=20=E5=9B=A2=E9=98=9F=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E9=83=A8=E9=97=A8=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerAppletServiceImpl.java   |  1 -
 .../crms/service/impl/CustomerServiceImpl.java    |  6 +++---
 .../resources/mapper/crms/CustomerAppletDao.xml   | 12 ++++++++++--
 .../controller/AlCollectionController.java        | 10 ++++++----
 .../service/impl/DgEfficiencyServiceImpl.java     |  3 +++
 .../financial/guarantee/util/OrdinaryUtil.java    | 15 ++++++++++++++-
 .../mapper/guarantee/AlCollectionMapper.xml       |  2 +-
 .../src/main/resources/jwt.properties             |  4 +++-
 8 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java
index 8a83ff51..6dd29159 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java
@@ -370,7 +370,6 @@ public class CustomerAppletServiceImpl extends ServiceImpl<CustomerAppletDao, Cu
     public Map getApplyMount() {
         // 这个是否填小数没有影响,主要要是看赋予或计算的值是否包含小数
         BigDecimal company = new BigDecimal(0.00);
-        // Double company = 0.00;
         Map<String, BigDecimal> map = new HashMap<>();
         map.put("company", company);
         // 个人类型暂时没有
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
index 227cb424..392c5367 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
@@ -669,12 +669,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         //根据id查询crms_company_customer表里面的customerId
         CompanyCustomerEntity entity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
                 .eq("customer_id", customerEntity.getId()));
-        companyCustomerEntity.setCustomerId(entity.getId());
+        companyCustomerEntity.setCustomerId(customerEntity.getId());
         int company = companyCustomerDao.update(companyCustomerEntity, new QueryWrapper<CompanyCustomerEntity>()
                 .eq("customer_id", companyCustomerEntity.getCustomerId()));
 
         //根据企业id删除关联关系
-        crmsCustomerRelatedMapper.delete(new QueryWrapper<CrmsCustomerRelated>().eq("customer_id",entity.getId()));//companyCustomerEntity.getId()
+        crmsCustomerRelatedMapper.delete(new QueryWrapper<CrmsCustomerRelated>().eq("customer_id", entity.getId()));//companyCustomerEntity.getId()
 
         //绑定关联关系
         List<CrmsCustomerRelated> relatedList = new ArrayList<>();
@@ -683,7 +683,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         for (int i = 0; i < intList.size(); i++) {
             CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
             Integer integer = intList.get(i);
-            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getCustomerId().intValue());//企业id  companyCustomerEntity.getId().intValue()
+            crmsCustomerRelated.setCustomerId(entity.getId().intValue());//企业id  companyCustomerEntity.getId().intValue()
             crmsCustomerRelated.setRelatedId(integer);//关联人/企业id
             relatedList.add(crmsCustomerRelated);
         }
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml
index a51a7126..a2196242 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml
@@ -8,11 +8,19 @@
     </insert>
 
     <select id="getCustomerStatus" resultType="integer">
-        SELECT COUNT(id) FROM crms_customer_user WHERE user_id = #{userId} AND type = #{type}
+        SELECT COUNT(cu.id) FROM crms_customer_user AS cu
+        INNER JOIN crms_customer AS c
+        ON cu.customer_id = c.id
+        WHERE c.del_or_not = 0
+        AND cu.user_id = #{userId} AND cu.type = #{type}
     </select>
 
     <select id="getCustomerId" resultType="integer">
-        SELECT customer_id FROM crms_customer_user WHERE user_id = #{userId} AND type = #{type}
+        SELECT cu.customer_id FROM crms_customer_user AS cu
+        INNER JOIN crms_customer AS c
+        ON cu.customer_id = c.id
+        WHERE c.del_or_not = 0
+        AND cu.user_id = #{userId} AND cu.type = #{type}
     </select>
 
     <!-- 更新客户基本信息 -->
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
index d61b4c38..bb2aea39 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
@@ -6,6 +6,7 @@ import com.daqing.financial.guarantee.model.request.AlCollectionRequest;
 import com.daqing.financial.guarantee.model.response.AlCollectionListResponse;
 import com.daqing.financial.guarantee.model.response.AlCollectionResponse;
 import com.daqing.financial.guarantee.model.response.MoreOverdueDetailResponse;
+import com.daqing.financial.guarantee.model.response.OverdueDetailResponse;
 import com.daqing.financial.guarantee.service.IAlCollectionService;
 import com.daqing.framework.domain.guarantee.AlCollection;
 import com.daqing.framework.model.response.ResponseResult;
@@ -15,9 +16,10 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
+import java.io.*;
 import java.util.List;
 
 /**
@@ -62,7 +64,7 @@ public class AlCollectionController {
      * 催收时展示的详情
      */
     @GetMapping("/overdue/detail")
-    @ApiOperation(value = "催收时展示的详情", notes = "催收时展示的详情")
+    @ApiOperation(value = "催收时展示的详情", notes = "催收时展示的详情", response = OverdueDetailResponse.class)
     public ResponseResult overdueDetail(@RequestParam("insuranceId") Integer insuranceId) {
 
         return ResponseResult.SUCCESS(alCollectionService.overdueDetail(insuranceId));
@@ -103,8 +105,8 @@ public class AlCollectionController {
      * 催收列表导出
      */
     @ApiOperation(value = "催收列表导出", notes = "催收列表导出")
-    @PostMapping("/collection/list/export/excel")
-    public ResponseResult collectionListExportExcel(@RequestBody List<Integer> ids, HttpServletResponse response) throws IOException {
+    @GetMapping("/collection/list/export/excel")
+    public ResponseResult collectionListExportExcel(@RequestParam("ids") List<Integer> ids, HttpServletResponse response) throws IOException {
 
         alCollectionService.collectionListExportExcel(ids, response);
         return ResponseResult.SUCCESS();
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 72341baa..7f73c76d 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
@@ -185,6 +185,9 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                 map.put(processId, time + ",1");
                 String[] departmentIds = departmentIdList.split(",");
                 for (String departmentId : departmentIds) {
+                    if (departmentId.equals("0")) {
+                        continue;
+                    }
                     // 没有当前部门的数据,直接新建一个
                     if (hashMap.get(Integer.parseInt(departmentId)) == null) {
                         hashMap.put(Integer.parseInt(departmentId), map);
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/OrdinaryUtil.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/OrdinaryUtil.java
index ac7056a5..5ef3aaeb 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/OrdinaryUtil.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/OrdinaryUtil.java
@@ -32,7 +32,20 @@ public class OrdinaryUtil {
      */
     public static String getDepartmentId(Integer userId) {
         String departmentIds = ordinaryUtil.hrmsFeignService.getDepartmentIds(userId);
+        if (departmentIds == null || departmentIds.length() == 0) {
+            departmentIds = "0";
+        } else {
+            boolean flag = true;
+            // 判断departmentIds是不是"1,2,3,4"这种格式,不是就设置为"0"
+            for (int i = 0; i < departmentIds.length(); i++) {
+                if ("0123456789,".indexOf(departmentIds.charAt(i)) == -1) {
+                    flag = false;
+                }
+            }
+            if (!flag) {
+                departmentIds = "0";
+            }
+        }
         return departmentIds;
     }
-
 }
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
index 0ab22865..7a894302 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
@@ -40,7 +40,7 @@
     </insert>
 
     <select id="getOverdueDetailByInsuranceId" parameterType="integer" resultType="com.daqing.financial.guarantee.model.response.OverdueDetailResponse">
-       SELECT i.business_code AS code,i.customer_name AS name,i.business_type AS type,COUNT(c.id) AS numberOfCollection
+       SELECT i.customer_name AS name,i.business_type AS type,i.business_code AS code,COUNT(c.id) AS number_of_collection
        FROM al_insurance_list AS i
        INNER JOIN al_collection AS c
        ON i.id = c.insurance_id
diff --git a/dq-govern-gateway/src/main/resources/jwt.properties b/dq-govern-gateway/src/main/resources/jwt.properties
index 85b141e8..681d9431 100644
--- a/dq-govern-gateway/src/main/resources/jwt.properties
+++ b/dq-govern-gateway/src/main/resources/jwt.properties
@@ -32,7 +32,9 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-copy-user/exportCopyForMe,\
   /apiHrmsAuth/hrms/auth/userlogin/wxAuthLogin,\
   /api-guarantee/al-insurance-list/excelExport,\
-  /api-guarantee/al-repayment-entry/excelExport
+  /api-guarantee/al-repayment-entry/excelExport,\
+  /api-guarantee/al-collection/list/export/excel,\
+  /api-guarantee/al-collection/collection/list/export/excel