From 2162e93732df17ce5b59e0fb4146c6f3248107a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 18:02:48 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 588beff..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
@@ -412,7 +414,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍宸插鐞�!");
}
Visits visits = visitsMapper.selectById(approve.getObjId());
- if(Objects.isNull(visits)){
+ if(Objects.isNull(visits)||Constants.equalsInteger(visits.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!auditApproveDTO.getMemberId().equals(approve.getChekorId())){
@@ -977,6 +979,7 @@
}
//鏍规嵁鎵嬫満鍙峰拰韬唤璇佸彿鐮佹煡璇� 褰撳墠棰勭害鐨勬椂闂存槸鍚︿笌鍏朵粬棰勭害璁板綍鏈夊啿绐�
if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getIsdeleted,Constants.ZERO)
.notIn(Visits::getStatus,Constants.VisitStatus.cancel
,Constants.VisitStatus.noPass
,Constants.VisitStatus.xfFail
@@ -1002,6 +1005,7 @@
*/
private void isExsitNoOutVisisRecord(Member member) {
Visits v = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getIsdeleted,Constants.ZERO)
.eq(Visits::getPhone, member.getPhone())
.eq(Visits::getStatus,Constants.VisitStatus.xfSuccess)
.last(" limit 1" )
@@ -1153,11 +1157,11 @@
params[0] = user.getRealname();
params[1]=DateUtil.getPlusTime2(date);
if(Constants.equalsInteger(model.getType(),Constants.TWO)){
- params[2]=model.getCarNos()+"-銆愬崟浣嶏細"+model.getCompanyName()+" "+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
+ params[2]="銆愯溅鐗屽彿锛�"+model.getCarNos()+"銆�-銆愬崟浣嶏細"+model.getCompanyName()+" "+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
//璁板綍鍒犻櫎璁垮鎶ュ鏃ュ織
- UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+ UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_CAR_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
}else{
- params[2]=model.getCompanyName()+"-銆愯瀹細"+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
+ params[2]="銆愬崟浣嶏細"+model.getCompanyName()+"銆�-銆愯瀹細"+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
//璁板綍鍒犻櫎璁垮鐢宠鏃ュ織
UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
}
@@ -1884,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