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 1f84252c..ff99d741 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml @@ -97,8 +97,8 @@ FROM dg_audit_process WHERE - ( reason != NULL OR reason != '' ) - AND business_id = #{businessId} + /*( reason != NULL OR reason != '' )*/ + business_id = #{businessId} ORDER BY create_time DESC LIMIT 1 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index faf9204b..1474fcc1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -200,7 +200,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl() - .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3)); +/* DgGuaranteeAssignUser assignUser1=null; + if(guaranteeAssignUser.getType().equals(3)){//查询担保部经理审核的金额和期限 + assignUser1 = this.baseMapper.selectOne(new QueryWrapper() + .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3)); + + }else{//查询担保部领导审核的金额和期限 + assignUser1 = this.baseMapper.selectOne(new QueryWrapper() + .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4)); + } + guaranteeAssignUser.setAmount(assignUser1.getAmount()); - guaranteeAssignUser.setTerm(assignUser1.getTerm()); + guaranteeAssignUser.setTerm(assignUser1.getTerm());*/ DgGuaranteeAssignUserResponse assignUser = new DgGuaranteeAssignUserResponse(); BeanUtils.copyProperties(guaranteeAssignUser,assignUser); - assignUser.setRemarks(assignUser1.getRemark()); + //assignUser.setRemarks(assignUser1.getRemark()); - String remarks = assignUser1.getRemark(); + String remarks = guaranteeAssignUser.getRemark(); if(remarks != null){ if (remarks.length() > 0) { String a = remarks.substring(1, remarks.length() - 1);