From 35ee8fa998efd94733b479307256f32136671ed2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 13:54:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 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..87eb2ef 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
@@ -85,6 +85,8 @@
@Autowired
private ApproveMapper approveMapper;
@Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+ @Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
private DeviceRoleMapper deviceRoleMapper;
@@ -118,8 +120,6 @@
private SystemUserMapper systemUserMapper;
@Autowired
private ApproveService approveService;
- @Autowired
- private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
@Autowired
@@ -1887,22 +1887,50 @@
@Override
public void visitNoCheckCancel(){
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);
}
}
}
+ @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)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getStatusInfo,"宸插彇娑�")
+ .eq(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
+ .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