diff --git a/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/RemoteStudentService.java b/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/RemoteStudentService.java index ca45fa2..43f75aa 100644 --- a/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/RemoteStudentService.java +++ b/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/RemoteStudentService.java @@ -69,5 +69,6 @@ public interface RemoteStudentService @PostMapping(value = "/sysPeople/batchDown") void batchDown(String inner); - + @PostMapping(value = "/stuff/expireVisCarryStuff") + void expireVisCarryStuff(); } diff --git a/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/factory/RemoteStudentFallbackFactory.java b/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/factory/RemoteStudentFallbackFactory.java index 9ec7174..901ebc6 100644 --- a/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/factory/RemoteStudentFallbackFactory.java +++ b/dcsoft-api/dcsoft-api-system/src/main/java/com/dcsoft/system/api/factory/RemoteStudentFallbackFactory.java @@ -88,6 +88,11 @@ public class RemoteStudentFallbackFactory implements FallbackFactory list = visCarryStuffService.selectexpireVisCarryStuff(dateTime); + if (CollUtil.isEmpty(list)) { + return; + } + + VisExitOutVo visExitOutVo = new VisExitOutVo(); + visExitOutVo.setIds(list); + visExitOutVo.setExamineState("5"); + visCarryStuffService.updateStaffState(visExitOutVo); + } + } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisCarryStuffMapper.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisCarryStuffMapper.java index f92de8d..2ca8cda 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisCarryStuffMapper.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisCarryStuffMapper.java @@ -3,6 +3,7 @@ package com.dcsoft.system.visitor.mapper; import com.dcsoft.system.visitor.domain.*; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; public interface VisCarryStuffMapper { @@ -36,4 +37,8 @@ public interface VisCarryStuffMapper { void updateVisitorReviewProcessById(VisitorReviewProcessVo reviewProcess); void deleteVisitorReviewProcess(Long id); + + List selectexpireVisCarryStuff(Date dateTime); + + void updateStaffState(VisExitOutVo visExitOutVo); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisCarryStuffService.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisCarryStuffService.java index 38f9863..728f82d 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisCarryStuffService.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisCarryStuffService.java @@ -2,6 +2,7 @@ package com.dcsoft.system.visitor.service; import com.dcsoft.system.visitor.domain.*; +import java.util.Date; import java.util.List; public interface IVisCarryStuffService { @@ -35,4 +36,8 @@ public interface IVisCarryStuffService { void updateVisitorReviewProcessById(VisitorReviewProcessVo reviewProcess); void cancel(VisExitOutVo vo); + + List selectexpireVisCarryStuff(Date dateTime); + + void updateStaffState(VisExitOutVo visExitOutVo); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisCarryStuffImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisCarryStuffImpl.java index 06a9794..4305ca7 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisCarryStuffImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisCarryStuffImpl.java @@ -87,6 +87,16 @@ public class VisCarryStuffImpl implements IVisCarryStuffService { visCarryStuffMapper.deleteVisitorReviewProcess(vo.getId()); } + @Override + public List selectexpireVisCarryStuff(Date dateTime) { + return visCarryStuffMapper.selectexpireVisCarryStuff(dateTime); + } + + @Override + public void updateStaffState(VisExitOutVo visExitOutVo) { + visCarryStuffMapper.updateStaffState(visExitOutVo); + } + @Override public VisExitOutVo selectVisExitOutById(Long id) { return visCarryStuffMapper.selectVisExitOutById(id); diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml index c4714e6..6180a94 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml @@ -149,6 +149,15 @@ where id = #{id} + + update vis_exit_out + set examine_state = #{examineState} + where id in + + #{id} + + + delete from vis_visitor_review_process where exit_id = #{id} @@ -308,6 +317,16 @@ limit 1 + + insert into vis_exit_out