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 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 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 map = this.getOverdueConditionByInsuranceId(alCollectionRequest.getInsuranceId()); if (map != null) { @@ -212,7 +214,17 @@ public class AlCollectionServiceImpl extends ServiceImpl0){ + String a = measures.substring(1,measures.length()-1); + String arry[]=a.split(","); + List 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; /**