From 4b427634d3daa65f2a79549f11587d40ea1ec1cb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 16:11:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 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 d4a6aa1..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
@@ -18,6 +18,7 @@
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.dao.business.dao.*;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -27,10 +28,6 @@
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
-import com.doumee.dao.business.dao.CompanyMapper;
-import com.doumee.dao.business.dao.MemberMapper;
-import com.doumee.dao.business.dao.SmsConfigMapper;
-import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.DeviceJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
@@ -60,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;
@@ -77,6 +75,7 @@
* @date 2023/11/30 15:33
*/
@Service
+@Slf4j
public class VisitsServiceImpl implements VisitsService {
@Autowired
@@ -84,7 +83,11 @@
@Autowired
private VisitsJoinMapper visitsMapper;
@Autowired
+ private UserActionMapper userActionMapper;
+ @Autowired
private ApproveMapper approveMapper;
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
@Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
@@ -119,8 +122,6 @@
private SystemUserMapper systemUserMapper;
@Autowired
private ApproveService approveService;
- @Autowired
- private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
@Autowired
@@ -287,7 +288,7 @@
}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
visits.setStatus(Constants.VisitStatus.waitCheck);
visitsMapper.updateById(visits);
- approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),member);
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
@@ -344,7 +345,7 @@
}
}
- approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),null);
return visits.getId();
}
@@ -413,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())){
@@ -978,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
@@ -1003,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" )
@@ -1137,6 +1140,32 @@
public void deleteById(Integer id) {
visitsMapper.deleteById(id);
}
+ @Override
+ @Transactional(rollbackFor ={BusinessException.class,Exception.class})
+ public void deleteById(Integer id,LoginUserInfo user) {
+ Visits model = visitsMapper.selectById(id);
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ Date date = new Date();
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
+ .set(Visits::getIsdeleted,Constants.ONE)
+ .set(Visits::getEditDate,new Date())
+ .set(Visits::getEditor,user.getId())
+ .eq(Visits::getId,id));
+ String[] params = new String[3];
+ 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())+"銆�";
+ //璁板綍鍒犻櫎璁垮鎶ュ鏃ュ織
+ 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())+"銆�";
+ //璁板綍鍒犻櫎璁垮鐢宠鏃ュ織
+ UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+ }
+ }
@Override
public void delete(Visits visits) {
@@ -1180,6 +1209,7 @@
queryWrapper.leftJoin("Member t3 on t.CREATE_MEMBER_ID=t3.id");
queryWrapper.eq(Visits::getId,id);
+ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
if(result!=null){
@@ -1190,6 +1220,8 @@
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(deviceQuery);
result.setDeviceRoleList(deviceRoleList);
}
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
MPJLambdaWrapper<Visits> visitQuery = new MPJLambdaWrapper<>();
@@ -1373,7 +1405,7 @@
@Override
public VisitDetailVO getVisitDetail(Integer id,Integer memberId){
Visits visits = visitsMapper.selectById(id);
- if(Objects.isNull(visits)){
+ if(Objects.isNull(visits) || Constants.equalsInteger(visits.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
Member member = memberMapper.selectById(visits.getReceptMemberId());
@@ -1501,7 +1533,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!visits.getStatus().equals(Constants.VisitStatus.signin)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呮敮鎸併�愭嫓璁夸腑銆戠姸鎬佽繘琛岃绂诲満鎿嶄綔锛岃鍒锋柊閲嶈瘯");
}
VisitAppointmentOutRequest request = new VisitAppointmentOutRequest();
request.setOrderId(visits.getHkId());
@@ -1854,6 +1886,55 @@
}
+ @Override
+ public void visitNoCheckCancel(){
+ log.info("===============寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�===========start=======");
+ List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
+ .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){
+ 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