From a58208ba19f52c8d13a0ab1a88bd62ffe8802dd3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 20 三月 2025 17:03:45 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index 2d7c9bf..68f64cb 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -57,6 +57,7 @@ import com.doumee.service.business.third.EmayService; import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -74,6 +75,7 @@ * @date 2023/11/30 15:33 */ @Service +@Slf4j public class VisitsServiceImpl implements VisitsService { @Autowired @@ -84,6 +86,8 @@ private UserActionMapper userActionMapper; @Autowired private ApproveMapper approveMapper; + @Autowired + private NoticesJoinMapper noticesJoinMapper; @Autowired private ApproveParamMapper approveParamMapper; @Autowired @@ -118,8 +122,6 @@ private SystemUserMapper systemUserMapper; @Autowired private ApproveService approveService; - @Autowired - private NoticesJoinMapper noticesJoinMapper; @Autowired private InoutDayCountMapper inoutDayCountMapper; @Autowired @@ -1886,22 +1888,52 @@ } @Override public void visitNoCheckCancel(){ + log.info("===============寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�===========start======="); List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda() - .eq(Visits::getIsdeleted,Constants.ONE) + .eq(Visits::getIsdeleted,Constants.ZERO) .eq(Visits::getStatus,Constants.VisitStatus.waitCheck) .apply(" now() >= ENDTIME ") ); if(visitsList!=null){ Date date =new Date(); for(Visits s :visitsList){ - visitsMapper.update(null,new UpdateWrapper<Visits>().lambda() - .set(Visits::getIsdeleted,Constants.VisitStatus.cancel) - .set(Visits::getEditDate,date) - .set(Visits::getRemark,"棰勭害鎴鏃堕棿宸茶繃鏈鎵癸紝绯荤粺鑷姩鍙栨秷") - .eq(Visits::getId,s.getId())); + dealAutoCancelBiz(s,date); } } + log.info("===============寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�===========end======="); + } + @Transactional + private void dealAutoCancelBiz(Visits s, Date date) { + visitsMapper.update(null,new UpdateWrapper<Visits>().lambda() + .set(Visits::getStatus,Constants.VisitStatus.cancel) + .set(Visits::getEditDate,date) + .set(Visits::getRemark,"棰勭害鎴鏃堕棿宸茶繃鏈鎵癸紝绯荤粺鑷姩鍙栨秷") + .eq(Visits::getId,s.getId())); + //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑� + approveMapper.update(null, + new UpdateWrapper<Approve>().lambda() + .set(Approve::getEditDate,date) + .set(Approve::getStatus,Constants.approveStatus.cancel) + .set(Approve::getStatusInfo,"绯荤粺宸插彇娑�") + .set(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�") + .eq(Approve::getIsdeleted,Constants.ZERO) + .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait) + .eq(Approve::getObjId,s.getId()) + .eq(Approve::getObjType,s.getType())); + //鏇存柊寰呭姙娑堟伅鐘舵�� + noticesJoinMapper.update(null, + new UpdateWrapper<Notices>().lambda() + .set(Notices::getEditDate,date) + .set(Notices::getInfo,"宸插彇娑�") +// .set(Notices::getStatus,Constants.ONE) + .set(Notices::getParam2,Constants.FOUR)//宸插彇娑� + .eq(Notices::getIsdeleted,Constants.ZERO) + .eq(Notices::getStatus,Constants.ZERO) + .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞� + .eq(Notices::getObjId,s.getId()) + .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting) + ); } -- Gitblit v1.9.3