From e9e77aabc85c83387242a4f8a476522263dc1fd6 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Mon, 29 Mar 2021 11:34:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/service/impl/DgLoanNoticeServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java index e1bd800f..a9cca3e4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java @@ -161,7 +161,9 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl Date: Mon, 29 Mar 2021 11:57:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/service/impl/AlRepaymentEntryServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 aa692749..39d1c1c4 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 @@ -169,7 +169,11 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl Date: Mon, 29 Mar 2021 14:48:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=99=8D=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml | 1 + .../src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml | 1 + .../mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index b12828a3..87247e3f 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml @@ -58,6 +58,7 @@ AND lau.status = #{status} + ORDER BY lau.create_time DESC diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml index 559c64f0..ec91459c 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml @@ -57,6 +57,7 @@ AND ln.status = #{status} + ORDER BY ln.create_time DESC From a9c8277bc7f2804d739b13996f4042e731b78e7d Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 29 Mar 2021 15:21:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DgBusinessProcessStatusMapper.java | 4 ++++ .../model/response/AlRepaymentEntryListRes.java | 2 ++ .../impl/DgApplyAmountInfoServiceImpl.java | 17 +++++++++++++++++ .../guarantee/DgBusinessProcessStatusMapper.xml | 10 ++++++++++ .../domain/guarantee/GuaranteeCode.java | 4 +++- 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessProcessStatusMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessProcessStatusMapper.java index d3700398..1cdedeb6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessProcessStatusMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessProcessStatusMapper.java @@ -4,6 +4,9 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.daqing.framework.domain.guarantee.DgBusinessProcessStatus; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -16,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DgBusinessProcessStatusMapper extends BaseMapper { + int selectBybusinessIdAndStatus(@Param("businessIds") List businessIds, @Param("businessStatus") Integer businessStatus); } 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 index 0f5a9dd4..550815b2 100644 --- 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 @@ -97,6 +97,7 @@ public class AlRepaymentEntryListRes implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(fill= FieldFill.INSERT) private Date createTime; @@ -104,6 +105,7 @@ public class AlRepaymentEntryListRes implements Serializable { * 修改时间 */ @TableField(fill= FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date updateTime; /** * 担保额度（元） diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index 6df68875..b100cba5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -135,6 +135,23 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl businessCompanyList = dgBusinessCompanyMapper.selectList(new QueryWrapper() + .eq("social_unified_code", businessApplication.getSocialUnifiedCode())); + List businessIds = new ArrayList(); + for (DgBusinessCompany businessCompany:businessCompanyList) { + businessIds.add(businessCompany.getBusinessId()); + } + //根据业务id查询dg_business_process_status表中是否存在业务为进行中的记录 + Integer businessStatus=StatusCode.YW_IN_PROGRESS;//进行中 + int count2 = dgBusinessProcessStatusMapper.selectBybusinessIdAndStatus(businessIds,businessStatus); + //如果存在，则不能再申请业务 + if(count2>0){ + ExceptionCast.cast(GuaranteeCode.REPEAT_BUSINESS); + } + //申请贷款相关信息 DgApplyAmountInfo dgApplyAmountInfo = new DgApplyAmountInfo(); dgApplyAmountInfo.setCompanyId(businessApplication.getCompanyId()); diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml index 567a989d..8f71754e 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml @@ -9,4 +9,14 @@ + + diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java index 7d04872e..8de8578f 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java @@ -32,7 +32,9 @@ public enum GuaranteeCode implements ResultCode { EFFICIENCY_TIME_ERROR(false, 130001,"时间格式错误!"), FROM_DESIGN_PROCESS_ERROR(false,140001,"当前节点数据不存在!"), - FROM_DESIGN_NAME_NOT_NULL(false,140002,"字段名称不能为空!"); + FROM_DESIGN_NAME_NOT_NULL(false,140002,"字段名称不能为空!"), + + REPEAT_BUSINESS(false,140002,"企业已申请进行中的业务，不能再次申请！"); /** * 操作是否成功 */ From d855dcc6aca702880467435d51e55d7540298d07 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Mon, 29 Mar 2021 15:47:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8B=85=E4=BF=9D=E5=87=BD=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=86=8D=E5=90=8C=E6=84=8F=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgGuaranteeLetterAssignUserServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 691ded26..3e0140fb 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 @@ -424,12 +424,27 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl paymentConfirmationConsiderQueryWrapper = new QueryWrapper<>(); paymentConfirmationConsiderQueryWrapper.eq("business_id",businessId).eq("role_id",PromptSuccess.CWB_ID); DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(paymentConfirmationConsiderQueryWrapper); paymentConfirmationConsider.setStatus(StatusCode.SP_IN_REVIEW); paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND); + + //法规部数据存在，更新法规部经理财务回款数据 + QueryWrapper paymentConfirmationConsiderFG = new QueryWrapper<>(); + paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); + DgPaymentConfirmationConsider paymentConfirmationConsiderFg = paymentConfirmationConsiderMapper.selectOne(paymentConfirmationConsiderFG); + //数据存在，进行更新 + if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){ + paymentConfirmationConsiderFg.setStatus(StatusCode.SP_IN_REVIEW); + paymentConfirmationConsiderFg.setOperatingStatus(StatusCode.CZ_ON_HAND); + //清空上次的审批意见及银行回单 + paymentConfirmationConsiderFg.setAuditOpinion(""); + paymentConfirmationConsiderFg.setImgFile(""); + paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderFg); + } + //清空上次的审批意见及银行回单 paymentConfirmationConsider.setAuditOpinion(""); paymentConfirmationConsider.setImgFile("");