From 5564f76685e1e7c359656f4c4ff217709cd883ac Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 23 Mar 2021 10:53:22 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/daqing/framework/domain/crms/CompanyCustomerEntity.java | 2 ++ .../daqing/framework/domain/crms/ext/CustomerCompanyDTO.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java index 44a46267..4b77221e 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -92,6 +93,7 @@ public class CompanyCustomerEntity implements Serializable { @ApiModelProperty(value = "经营地址") private String businessAddr; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "注册时间") private Date registerTime; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java index 3e5d49a9..905a280d 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java @@ -1,5 +1,6 @@ package com.daqing.framework.domain.crms.ext; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -96,6 +97,7 @@ public class CustomerCompanyDTO implements Serializable { @ApiModelProperty(value = "社会统一代码") private String socialUnifiedCode; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "注册时间") private Date registerTime; From 92383d0ab19522016ee5c3d94a8ce222dbf24f71 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 23 Mar 2021 11:43:01 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/model/request/BusinessApplicationRequest.java | 2 +- .../daqing/framework/domain/guarantee/DgBusinessCompany.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java index d0e8af30..37f4af09 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java @@ -261,7 +261,7 @@ public class BusinessApplicationRequest implements Serializable { * 注册时间 */ @ApiModelProperty(value = "注册时间") - private String registerTime; + private Date registerTime; /** * 注册地址 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessCompany.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessCompany.java index b3ca72d2..38f4fb06 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessCompany.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessCompany.java @@ -77,7 +77,7 @@ public class DgBusinessCompany implements Serializable { /** * 注册时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date registerTime; /** From add329ebdf1b3f44f0614d7357d8c2f754d7aba5 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 23 Mar 2021 12:00:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gGuaranteeLetterAssignUserServiceImpl.java | 46 ++++++++++++++----- ...aymentConfirmationConsiderServiceImpl.java | 8 ++-- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index ff9d8c9c..691ded26 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -831,39 +831,61 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = guaranteeLetterAssignUserOne.getUserId(); - //没有操作过则法规部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = guaranteeLetterAssignUserOne.getOperatingStatus(); + //待处理则法规部经理操作 + if (operatingStatus.equals(1)){ return this.regulatoryDepartmentManagerOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有a角，则a角操作 + //已处理，拥有a角，则a角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))){ //a角数据是否被操作过 QueryWrapper queryWrapperTwo = new QueryWrapper<>(); queryWrapperTwo.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTwo = baseMapper.selectOne(queryWrapperTwo); - Integer userIdA = guaranteeLetterAssignUserTwo.getUserId(); - //没有操作过则a角操作 - if (ObjectUtil.isNull(userIdA)){ + Integer operatingStatusA = guaranteeLetterAssignUserTwo.getOperatingStatus(); + //待处理则a角操作 + if (operatingStatusA.equals(1)){ return this.aRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有b角，则b角操作 + //已处理，拥有b角，则b角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ //b角数据是否被操作过 QueryWrapper queryWrapperThree = new QueryWrapper<>(); queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); - Integer userIdB = guaranteeLetterAssignUserThree.getUserId(); - //没有操作过则b角操作 - if (ObjectUtil.isNull(userIdB)){ + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ return this.bRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有资产部经理，则资产部经理操作 + //已处理，拥有资产部经理，则资产部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); } } } + + //已处理，拥有b角，则b角操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ + //b角数据是否被操作过 + QueryWrapper queryWrapperThree = new QueryWrapper<>(); + queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ + return this.bRoleOperating(businessId,currentUser,auditOpinion,status); + } + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } + } + + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } } //角色为资产部经理则确认担保函操作和驳回操作 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index 5e92ab90..d417791c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -397,12 +397,12 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); DgPaymentConfirmationConsider paymentConfirmationConsiderOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = paymentConfirmationConsiderOne.getConsiderId(); - //没有操作过则财务部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = paymentConfirmationConsiderOne.getOperatingStatus(); + //待处理则财务部经理操作 + if (operatingStatus.equals(1)){ return this.financeDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); } - //操作过，拥有法规部经理，则法规部经理操作 + //已处理，拥有法规部经理，则法规部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){ return this.regulationDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); } From 193fa12eef63b1ad08293c0289d0edd06a99e03d Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 23 Mar 2021 15:49:59 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AlRepaymentEntryMapper.java | 3 +- .../response/AlRepaymentEntryListRes.java | 112 ++++++++++++++++++ .../impl/AlRepaymentEntryServiceImpl.java | 3 +- .../guarantee/AlRepaymentEntryMapper.xml | 12 +- 4 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java index 62040a60..d9f4583b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.AlRepaymentCountRes; +import com.daqing.financial.guarantee.model.response.AlRepaymentEntryListRes; import com.daqing.financial.guarantee.model.response.AlRepaymentEntryRes; import com.daqing.financial.guarantee.model.response.AlRepaymentRes; import com.daqing.framework.domain.guarantee.AlRepaymentEntry; @@ -22,7 +23,7 @@ import java.util.List; @Mapper public interface AlRepaymentEntryMapper extends BaseMapper { - IPage pageByCondition(Page page, String customerNumberOrName, Integer status,Integer insuranceId); + IPage pageByCondition(Page page, String customerNumberOrName, Integer status, Integer insuranceId); List selectListByIds(List ids); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java new file mode 100644 index 00000000..0f5a9dd4 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java @@ -0,0 +1,112 @@ +package com.daqing.financial.guarantee.model.response; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 还款记录表 + *

+ * + * @author Qyq + * @since 2021-03-17 + */ +@Data +public class AlRepaymentEntryListRes implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 保后外键id + */ + private Integer insuranceId; + + /** + * 应还款日 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date repaymentDate; + + /** + * 实际还款日 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualRepaymentDate; + + /** + * 逾期天数 + */ + private Integer overdueDays; + + /** + * 还款总额（元） + */ + private BigDecimal totalRepayment; + + /** + * 本次还款（元） + */ + private BigDecimal currentRepayment; + + /** + * 利息（元） + */ + private BigDecimal interest; + + /** + * 其他费用（元） + */ + private BigDecimal otherExpenses; + + /** + * 减免金额（元） + */ + private BigDecimal deductionAmount; + + /** + * 还款备注 + */ + private String repaymentNotes; + + /** + * 还款状态：1->待还款；2->已还款；3->已逾期；4->未到期； + */ + private Integer repaymentStatus; + + /** + * 提交人id + */ + private Integer submitterId; + + /** + * 提交人名称 + */ + private String submitterName; + + /** + * 创建时间 + */ + @TableField(fill= FieldFill.INSERT) + private Date createTime; + + /** + * 修改时间 + */ + @TableField(fill= FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * 担保额度（元） + */ + private Double guaranteeAmount; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java index 5fb3a869..b87f245c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java @@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.mapper.AlInsuranceListMapper; import com.daqing.financial.guarantee.mapper.AlRepaymentEntryMapper; import com.daqing.financial.guarantee.model.request.AlRepaymentEntryReq; +import com.daqing.financial.guarantee.model.response.AlRepaymentEntryListRes; import com.daqing.financial.guarantee.model.response.AlRepaymentEntryRes; import com.daqing.financial.guarantee.model.response.AlRepaymentRes; import com.daqing.financial.guarantee.service.IAlRepaymentEntryService; @@ -72,7 +73,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId); + IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId); return new PageUtils(positionVO); } 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 fc47c941..f89b18d8 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml @@ -20,20 +20,20 @@ - + select re.*,il.guarantee_amount as guaranteeAmount from al_repayment_entry re left join al_insurance_list il on il.id=re.insurance_id - repayment_status = #{status} + re.repayment_status = #{status} - AND repayment_date = #{customerNumberOrName} + AND re.repayment_date = #{customerNumberOrName} - AND insurance_id = #{insuranceId} + AND re.insurance_id = #{insuranceId} - order by create_time desc + order by re.create_time desc