From 6e19994b052808da1c752e96f0ffa3cf26320bf3 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 14 Apr 2021 15:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E6=94=B6=E9=99=84=E4=BB=B6=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=94=B3=E8=AF=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crms/service/impl/CustomerAppletServiceImpl.java | 10 +++++++++-
 .../guarantee/model/request/AlCollectionRequest.java |  2 +-
 .../model/response/MoreOverdueDetailResponse.java    |  3 +++
 .../service/impl/AlCollectionServiceImpl.java        | 12 ++++++++++++
 .../framework/domain/crms/CrmsCompanyPersonal.java   |  2 +-
 5 files changed, 26 insertions(+), 3 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 b2383e4e..cfa4085b 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
@@ -343,6 +343,7 @@ public class CustomerAppletServiceImpl extends ServiceImpl<CustomerAppletDao, Cu
             List<ApplicationRecordPO> applicationRecordPOList = iPage.getRecords();
             for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) {
                 ApplicationRecordResponse applicationRecordResponse = new ApplicationRecordResponse();
+                //status:0->已完成；1->已受理；2->审核中；3->已拒绝；4->已驳回；5->已撤销；
                 // 状态为已受理、审核中、拒绝、驳回、已撤销情况
                 if (applicationRecordPO.getAuditStatus() != null && (applicationRecordPO.getAuditStatus() == 1
                         || applicationRecordPO.getAuditStatus() == 2 || applicationRecordPO.getAuditStatus() == 3
@@ -351,10 +352,17 @@ public class CustomerAppletServiceImpl extends ServiceImpl<CustomerAppletDao, Cu
                     applicationRecordResponse.setStatus(applicationRecordPO.getAuditStatus());
                     applicationRecordResponse.setType(1);
                 }
+
+                // 业务状态为已否决的情况,如果同时存在会覆盖以上情况
+                if (applicationRecordPO.getBusinessStatus() != null && applicationRecordPO.getBusinessStatus() == 3) {
+                    BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse);
+                    applicationRecordResponse.setStatus(3);//状态设置为已拒绝
+                    applicationRecordResponse.setType(1);
+                }
                 // 状态为已完成的情况,如果同时存在已完成会覆盖以上情况
                 if (applicationRecordPO.getBusinessStatus() != null && applicationRecordPO.getBusinessStatus() == 2) {
                     BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse);
-                    applicationRecordResponse.setStatus(0);
+                    applicationRecordResponse.setStatus(0);//状态设置为已完成
                     applicationRecordResponse.setType(1);
                 }
                 applicationRecordResponseList.add(applicationRecordResponse);
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/AlCollectionRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/AlCollectionRequest.java
index 88734f53..eea677da 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/AlCollectionRequest.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/AlCollectionRequest.java
@@ -40,6 +40,6 @@ public class AlCollectionRequest implements Serializable {
 
     @ApiModelProperty("附件")
     @NotNull(message = "请上传催收附件")
-    private String enclosureFile;
+    private String[] enclosureFiles;
 
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MoreOverdueDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MoreOverdueDetailResponse.java
index 366a4953..5d314805 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MoreOverdueDetailResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MoreOverdueDetailResponse.java
@@ -61,4 +61,7 @@ public class MoreOverdueDetailResponse implements Serializable {
     @ApiModelProperty("附件")
     private String enclosureFile;
 
+    @ApiModelProperty("附件")
+    private List<String> enclosureFiles;
+
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
index 060061e1..1d63fe5f 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
@@ -23,6 +23,7 @@ import com.daqing.framework.domain.hrms.ext.EmployeeVO;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.response.CommonCode;
 import com.daqing.framework.model.response.ResponseResult;
+import com.daqing.framework.util.ArraysUtil;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
@@ -117,6 +118,7 @@ public class AlCollectionServiceImpl extends ServiceImpl<AlCollectionMapper, AlC
         }
         AlCollection alCollection = new AlCollection();
         BeanUtils.copyProperties(alCollectionRequest, alCollection);
+        alCollection.setEnclosureFile(ArraysUtil.toString(alCollectionRequest.getEnclosureFiles()));
         // 当前记录逾期额度、逾期利息、其他费用、逾期次数
         Map<String, Object> map = this.getOverdueConditionByInsuranceId(alCollectionRequest.getInsuranceId());
         if (map != null) {
@@ -212,7 +214,17 @@ public class AlCollectionServiceImpl extends ServiceImpl<AlCollectionMapper, AlC
         }
         // 催收时间、类型、反馈、附件等
         MoreOverdueDetailResponse moreOverdueDetailResponse = this.getBaseMapper().moreOverdueDetail(id);
+
         if (null != moreOverdueDetailResponse) {
+            String measures=moreOverdueDetailResponse.getEnclosureFile();
+            if(measures != null){
+                if(measures.length()>0){
+                    String a = measures.substring(1,measures.length()-1);
+                    String arry[]=a.split(",");
+                    List<String> demoList = Arrays.asList(arry);
+                    moreOverdueDetailResponse.setEnclosureFiles(demoList);
+                }
+            }
             OverdueDetailResponse overdueDetailResponse = overdueDetail(this.getBaseMapper().getInsuranceIdById(id));
             if (null != overdueDetailResponse) {
                 // 客户编号、姓名、类型、逾期、还款记录等
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java
index 2252dd82..5be42440 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java
@@ -59,7 +59,7 @@ public class CrmsCompanyPersonal implements Serializable {
      * 注册时间
      */
     @ApiModelProperty(value = "注册时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date registeredTime;
 
     /**