From 2f4c0bad775bee8bdb5c34937ad908b3c50b63a4 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 6 May 2021 16:10:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/crms/CustomerAppletDao.xml     |  4 ++--
 .../service/impl/DgEfficiencyServiceImpl.java       |  3 ++-
 .../impl/DgGuaranteeAssignUserServiceImpl.java      | 13 ++++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

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 96d35c84..8b46db5b 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<DgEfficiencyMapper, DgA
                             // 计算当前部门在当前节点的累计时间
                             String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf(","));
                             // 累计时间加上本次时间
-                            existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "," + count);
+                            //existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "," + count);
+                            existMap.put(processId, (Math.abs(Long.parseLong(existTime) + Long.parseLong(time))) + "," + count);
                         }
                         hashMap.put(Integer.parseInt(departmentId), existMap);
                     }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index 01ea4dfb..a818f6b6 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -188,9 +188,16 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 //        }
 
 
-        //查询担保部经理审核的金额和期限
-        DgGuaranteeAssignUser assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
-                .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
+        DgGuaranteeAssignUser assignUser1=null;
+        if(guaranteeAssignUser.getType().equals(3)){//查询担保部经理审核的金额和期限
+            assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
+
+        }else{//查询担保部领导审核的金额和期限
+            assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
+        }
+
         guaranteeAssignUser.setAmount(assignUser1.getAmount());
         guaranteeAssignUser.setTerm(assignUser1.getTerm());
         DgGuaranteeAssignUserResponse assignUser = new DgGuaranteeAssignUserResponse();

From 017a16bef9ed2594075abdc994fbe56ce19587fc Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 7 May 2021 10:14:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DgGuaranteeAssignUserServiceImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index a818f6b6..125e3a4f 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -188,7 +188,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 //        }
 
 
-        DgGuaranteeAssignUser assignUser1=null;
+/*        DgGuaranteeAssignUser assignUser1=null;
         if(guaranteeAssignUser.getType().equals(3)){//查询担保部经理审核的金额和期限
             assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
@@ -199,12 +199,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         }
 
         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);