From e1542733b722c76b3544c53b394e96a3df9e9a6a Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Mon, 11 Jan 2021 10:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=88=E7=8E=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DgEfficiencyServiceImpl.java | 57 +++++++++++++++----
 1 file changed, 46 insertions(+), 11 deletions(-)

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 ac094246..badbf56a 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
@@ -25,6 +25,7 @@ import com.daqing.framework.domain.guarantee.GuaranteeCode;
 import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO;
 import com.daqing.framework.domain.guarantee.po.StatusPO;
 import com.daqing.framework.exception.ExceptionCast;
+import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.google.common.collect.Maps;
@@ -308,7 +309,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(2);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -330,7 +335,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(3);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -352,7 +361,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(4);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -375,7 +388,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(5);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -396,7 +413,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(6);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -417,7 +438,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(7);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -439,7 +464,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(8);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -461,7 +490,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(9);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -483,7 +516,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
                     statusPO.setProcessId(10);
                     statusPO.setName(name);
                     statusPO.setStatus(status);
-                    hashMap.put(businessId, statusPO);
+                    //相同业务中，如果已经是待处理则数据不覆盖
+                    StatusPO po = (StatusPO)hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                        hashMap.put(businessId, statusPO);
+                    }
                 });
             }
         }
@@ -501,8 +538,6 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(key);
             //业务申请日期
             Date createTime = dgApplyAmountInfo.getCreateTime();
-            //客户公司id
-            Integer companyId = dgApplyAmountInfo.getCompanyId();
             //提单人id
             Integer presenterId = dgApplyAmountInfo.getPresenterId();
             efficiencyListResponse.setOperatingStatus(operatingStatus);