From b7e219ea47d13544c0499aef8814845a184986de Mon Sep 17 00:00:00 2001
From: "kaixiang.xia" <kaixiang.xia@supwisdom.com>
Date: Tue, 2 Mar 2021 14:33:06 +0800
Subject: [PATCH] =?utf8?q?=E5=AF=B9=E8=B4=A6=E5=88=B0=E4=BB=8A=E5=A4=A9?=
 =?utf8?q?=E8=A1=A8=E6=98=A8=E5=A4=A9=E5=B7=B2=E5=AF=B9=E8=B4=A6=E6=88=90?=
 =?utf8?q?=E5=8A=9F=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../SourcetypeCheckManagerServiceImpl.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SourcetypeCheckManagerServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SourcetypeCheckManagerServiceImpl.java
index b8790ae7..412522ff 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SourcetypeCheckManagerServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SourcetypeCheckManagerServiceImpl.java
@@ -8,6 +8,7 @@ import com.supwisdom.dlpay.api.domain.TSourceType;
 import com.supwisdom.dlpay.api.domain.TSourceTypeCheckStatus;
 import com.supwisdom.dlpay.api.domain.TTransactionChkdtl;
 import com.supwisdom.dlpay.api.domain.TTransactionChkfile;
+import com.supwisdom.dlpay.framework.service.SystemUtilService;
 import com.supwisdom.dlpay.framework.tenant.TenantContext;
 import com.supwisdom.dlpay.framework.util.DateUtil;
 import com.supwisdom.dlpay.framework.util.PageResult;
@@ -44,6 +45,8 @@ public class SourcetypeCheckManagerServiceImpl implements SourcetypeCheckManager
 
   @PersistenceContext
   private EntityManager entityManager;
+  @Autowired
+  private SystemUtilService systemUtilService;
 
 
   @Override
@@ -65,6 +68,22 @@ public class SourcetypeCheckManagerServiceImpl implements SourcetypeCheckManager
     query.setFirstResult((pageNo - 1) * pageSize);
     query.setMaxResults(pageSize); //分页显示
     List<TSourceTypeCheckStatus> list = query.getResultList();
+    if (null != list && list.size() > 0) {
+      //处理【对账到】和【已对账】问题，避免修改对账逻辑和结算逻辑，这里直接处理显示问题
+      final String today = systemUtilService.getSysdatetime().getHostdate();
+      for (TSourceTypeCheckStatus stat : list) {
+        if (today.equals(stat.getCheckAccdate())) {
+          //对账到了当前日期，说明昨天已对账完成。切换下展示内容
+          stat.setCheckAccdate(DateUtil.getNewDay(stat.getCheckAccdate(), -1));
+          stat.setCheckFileOk(true);
+          stat.setCheckStatus(true);
+          stat.setRepairStatus(true);
+          stat.setSettleStatus(true);
+          stat.setRemark("对账完成"); //显示昨天已对账完成
+        }
+      }
+    }
+
     Long count = (Long) countQuery.getSingleResult();
     return new PageResult<>(count.longValue(), list);
   }
-- 
2.17.1