diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java index 86ff1f59..bd6adbf7 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java @@ -35,5 +35,7 @@ public interface CustomerAppletDao extends BaseMapper { List getApplyMount(Integer companyId); + Integer businessUnderwayCount(Integer companyId); + ApplyDetailPO getApplyDetail(Integer id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java index 3f1fd98c..5d3677e1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -29,7 +30,7 @@ public class ApplicationRecordResponse implements Serializable { private String amountWide; @ApiModelProperty("申请额度") - private Double applyAmount; + private BigDecimal applyAmount; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") 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 692d609d..8a83ff51 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 @@ -37,6 +37,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.util.*; /** @@ -367,24 +368,33 @@ public class CustomerAppletServiceImpl extends ServiceImpl map = new HashMap<>(); + // 这个是否填小数没有影响,主要要是看赋予或计算的值是否包含小数 + BigDecimal company = new BigDecimal(0.00); + // Double company = 0.00; + Map map = new HashMap<>(); map.put("company", company); // 个人类型暂时没有 - map.put("personal", 0.00); + map.put("personal", new BigDecimal(0.00)); + // 是否与业务正在申请中 + map.put("underway", new BigDecimal(0)); Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1); // 如果查询不到认证信息,直接返回0.00 if (customerId == null) { map.put("company", company); } else { Integer companyId = this.getBaseMapper().getCompanyId(customerId); + // 正在进行贷款数量 + Integer count= this.getBaseMapper().businessUnderwayCount(companyId); + if (count > 0) { + map.put("underway", new BigDecimal(1)); + } // 查询申请记录信息 List applicationRecordPOList = this.getBaseMapper().getApplyMount(companyId); if (applicationRecordPOList.size() < 1) { return map; } for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) { - company += applicationRecordPO.getApplyAmount() == null ? 0.00 : applicationRecordPO.getApplyAmount(); + company = company.add(applicationRecordPO.getApplyAmount() == null ? new BigDecimal(0.00) : applicationRecordPO.getApplyAmount()); } map.put("company", company); } diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index 4591677a..d96f785e 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -1,20 +1,20 @@ #服务名称 -#spring.application.name=dq-financial-crms -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 +spring.application.name=dq-financial-crms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -30,30 +30,30 @@ ribbon.eureka.enabled=true # 正式环境（prod） #服务名称 -spring.application.name=dq-financial-crms -##配置中心地址 -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=prod -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=prod -spring.cloud.nacos.config.ext-config[2].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.application.name=dq-financial-crms +###配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file 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 3c7e37a2..a51a7126 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml @@ -59,6 +59,15 @@ AND b.business_status = 2 + + SELECT i.id AS id,i.business_code AS code,i.customer_name AS name,i.phone AS phone,i.business_type AS type, - i.guarantee_amount AS amount,i.department AS department,i.payment_status AS status + i.guarantee_amount AS amount,i.department AS department,i.payment_status AS status,COUNT(c.id) AS numberOfCollection FROM al_insurance_list AS i - INNER JOIN al_repayment_entry AS r - ON i.id = r.insurance_id - WHERE r.repayment_status = 3 + LEFT JOIN al_collection AS c + ON i.id = c.insurance_id + WHERE i.is_overdue = 0 + + AND i.payment_status = #{status} + + + AND (i.customer_name like CONCAT('%',#{codeOrName},'%') OR i.business_code like CONCAT('%',#{codeOrName},'%')) + GROUP BY i.id + + + INSERT INTO al_collection (insurance_id,collection_method,collection_time,collection_feedback,enclosure_file + ,overdue_amount,overdue_interest,other_expenses,collection_user,overdue_periods) + VALUES (#{ac.insuranceId},#{ac.collectionMethod},#{ac.collectionTime}, + #{ac.collectionFeedback},#{ac.enclosureFile}, + #{ac.overdueAmount},#{ac.overdueInterest},#{ac.otherExpenses}, + #{ac.collectionUser},#{ac.overduePeriods}) + + + + + + + + + + + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml index f89b18d8..7ae607f2 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml @@ -64,4 +64,19 @@ left join al_insurance_list il on re.insurance_id=il.id + + + + + + diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 21bfa8a9..b8985c09 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -#spring.application.name=dq-financial-hrms-auth -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 -# +spring.application.name=dq-financial-hrms-auth +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -33,30 +33,30 @@ ribbon.ConnectTimeout: 30000 #正式环境（prod） -spring.application.name=dq-financial-hrms-auth - -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=prod -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=prod -spring.cloud.nacos.config.ext-config[2].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 285832c1..db27d3dd 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -#spring.application.name=dq-financial-hrms -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 -# +spring.application.name=dq-financial-hrms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -36,30 +36,30 @@ spring.servlet.multipart.max-request-size=10MB # 正式环境（prod） #服务名称 -spring.application.name=dq-financial-hrms -#配置中心地址 -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=prod -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=prod -spring.cloud.nacos.config.ext-config[2].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.application.name=dq-financial-hrms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java index f9bf32f7..4aedd493 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -26,7 +27,7 @@ public class ApplicationRecordPO implements Serializable { /** * 申请额度 */ - private Double applyAmount; + private BigDecimal applyAmount; /** * 贷款用途 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java index 0c5b7e1c..b3692533 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java @@ -3,9 +3,13 @@ package com.daqing.framework.domain.guarantee; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -18,6 +22,7 @@ import java.util.Date; */ @Data @TableName("al_collection") +@ToString public class AlCollection implements Serializable { private static final long serialVersionUID = 1L; @@ -31,25 +36,58 @@ public class AlCollection implements Serializable { /** * 保后主键id */ + @ApiModelProperty("保后id") private Integer insuranceId; + /** + * 逾期金额 + */ + @ApiModelProperty("逾期金额") + private BigDecimal overdueAmount; + + /** + * 逾期利息 + */ + @ApiModelProperty("逾期利息") + private BigDecimal overdueInterest; + + /** + * 逾期费用 + */ + @ApiModelProperty("逾期费用") + private BigDecimal otherExpenses; + + /** + * 逾期期数 + */ + private Integer overduePeriods; + /** * 催收方式：1->电话催收；2->上门/外访； */ + @ApiModelProperty("催收方式：1->电话催收；2->上门/外访") private Integer collectionMethod; + + @ApiModelProperty("催收人") + private Integer collectionUser; + /** * 催收时间 */ + @ApiModelProperty("催收时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date collectionTime; /** * 催收反馈 */ + @ApiModelProperty("催收反馈") private String collectionFeedback; /** * 附件 */ + @ApiModelProperty("附件") private String enclosureFile; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java index 30286d3a..1ca4c681 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java @@ -3,6 +3,7 @@ package com.daqing.framework.domain.guarantee; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -37,11 +38,13 @@ public class AlRepaymentEntry implements Serializable { /** * 应还款日 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date repaymentDate; /** * 实际还款日 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date actualRepaymentDate; /** @@ -97,12 +100,14 @@ public class AlRepaymentEntry implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(fill= FieldFill.INSERT) private Date createTime; /** * 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(fill= FieldFill.INSERT_UPDATE) private Date updateTime; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java index 418e40c9..85323841 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -67,7 +68,7 @@ public class DgLoanCommitteeConsider implements Serializable { /** * 贷款金额（贷审会意见） */ - private Integer loanMoney; + private BigDecimal loanMoney; /** * 贷款期限（贷审会意见） diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionListPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionListPO.java new file mode 100644 index 00000000..d8527af2 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionListPO.java @@ -0,0 +1,76 @@ +package com.daqing.framework.domain.guarantee.po; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 催收列表po类 + * + * @auther River + * @date 2021/3/23 10:17 + */ +@Data +@ToString +public class AlCollectionListPO implements Serializable { + + /** + * id + */ + private Integer id; + + /** + *客户编号 + */ + private String code; + + /** + * 客户名称 + */ + private String name; + + /** + * 逾期金额 + */ + private BigDecimal overdueAmount; + + /** + * 逾期利息 + */ + private BigDecimal overdueInterest; + + /** + * 其他费用 + */ + private BigDecimal otherExpenses; + + /** + * 逾期次数 + */ + private Integer overduePeriods; + + /** + * 催收方法 + */ + private Integer collectionMethod; + + /** + * 催收人id + */ + private Integer collectionUser; + + /** + * 催收时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date collectionTime; + + /** + * 催收反馈 + */ + private String collectionFeedback; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java index 1af7a40f..11a07bfb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; /** * 催熟管理数据接收 @@ -43,13 +44,18 @@ public class AlCollectionPO implements Serializable { /** * 担保额度 */ - private Double amount; + private BigDecimal amount; /** * 所属部门 */ private String department; + /** + * 催收次数 + */ + private Integer numberOfCollection; + /** * 状态 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java index 5cedfd30..1cf0280c 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java @@ -3,6 +3,8 @@ package com.daqing.framework.domain.guarantee.po; import lombok.Data; import lombok.ToString; +import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -12,7 +14,7 @@ import java.util.Date; */ @Data @ToString -public class DgStatisticsPO { +public class DgStatisticsPO implements Serializable { /** * 客户名称 @@ -32,7 +34,7 @@ public class DgStatisticsPO { /** * 申请额度 */ - private Double applyAmount; + private BigDecimal applyAmount; /** * 申请期限 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java index 90b169e8..c90aa260 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsRefusePO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -32,7 +33,7 @@ public class DgStatisticsRefusePO implements Serializable { /** * 申请额度 */ - private Double applyAmount; + private BigDecimal applyAmount; /** * 申请期限 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgWorkConferencePO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgWorkConferencePO.java index e06e2280..e5691c05 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgWorkConferencePO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgWorkConferencePO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.ToString; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -32,7 +33,7 @@ public class DgWorkConferencePO implements Serializable { private String businessType; @ApiModelProperty("金额") - private Double applyAmount; + private BigDecimal applyAmount; @ApiModelProperty("期限") private String applyTime; diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/CollectionConverter.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/CollectionConverter.java new file mode 100644 index 00000000..1025d0bf --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/CollectionConverter.java @@ -0,0 +1,48 @@ +package com.daqing.framework.utils.excel; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.CellData; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +/** + * 催收管理状态转换器 + * + * @auther River + * @date 2021/3/24 9:52 + */ +public class CollectionConverter implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + return 0; + } + + @Override + public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + + switch (value) { + case 1: + return new CellData("还款中"); + case 2: + return new CellData("已逾期"); + case 3: + return new CellData("已还清"); + case 4: + return new CellData("已结项"); + default: + return new CellData(String.valueOf(value)); + } + } +} diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index 848b1819..8cd12f31 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -#spring.application.name=dq-govern-gateway -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 -# +spring.application.name=dq-govern-gateway +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -29,21 +29,21 @@ spring.servlet.multipart.max-request-size=10MB # 正式环境（prod） #服务名称 -spring.application.name=dq-govern-gateway -#配置中心地址 -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009 - -spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.application.name=dq-govern-gateway +##配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009 +# +#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file