From 4f519ec0f8c427a19e19e2ae99ef92d8732f591c Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 30 Jul 2024 15:54:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=9A=840=E5=85=83=E6=A0=B8=E9=94=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=87=8A=E6=94=BE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BazVisitInstanceController.java    |  2 +-
 .../service/impl/VtbVerificationServiceImpl.java  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
index 1a22a66e..a38ede1a 100644
--- a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
+++ b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
@@ -47,7 +47,7 @@ public class BazVisitInstanceController {
     public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){
         BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
         if(param.getQueryStartDate()!=null){
-            query.setQueryEndDate(param.getQueryStartDate().atStartOfDay());
+            query.setQueryStartDate(param.getQueryStartDate().atStartOfDay());
         }
         if(param.getQueryEndDate()!=null){
             query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index b1a531cf..ef1f644b 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -1356,6 +1356,21 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             verification.setVerificationState(VtbVerificationState.Finished.getCode());
             verification.setFinishedTime(LocalDateTime.now());
             super.updateById(verification);
+
+            //更新释放的核销(单个核销外层有释放，批量没有在这里补充)
+            if(verification.getBatchId()!=null
+                    &&verification.getRegReleaseFlag()!=null
+                    &&verification.getRegReleaseFlag().equals(1)){
+                //更新活动状态
+                SysUser sysUser = sysUserService.getById(verification.getRegReleaseUserId());
+                if(sysUser==null){
+                    sysUser = new SysUser();
+                    sysUser.setCode("0");
+                    sysUser.setName("系统执行");
+                }
+                this.release(verification.getActivityId(),sysUser.getCode(),true,false);
+            }
+            
             return;
         }
         TbsActivity activity = activityService.getById(verification.getActivityId());