From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 6cb1dbd..d7ee5e4 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
@@ -47,6 +47,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
@@ -205,7 +206,8 @@
getHkDeviceRoles(visits,isERP);
//妫�楠屾嫓璁夸汉鏄惁鍚堟硶
Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
- if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&visits.getIdcardNo().length()!=18
+ if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
+ &&visits.getIdcardNo().length()!=18
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
}
@@ -1140,6 +1142,15 @@
result.getType(),
memberId)
);
+ if(Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfSuccess)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfFail)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signin)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signout)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.invalid)){
+ result.setBusinessStatus(Constants.VisitStatus.pass);
+ }else{
+ result.setBusinessStatus(result.getStatus());
+ }
return result;
}
@@ -1259,6 +1270,15 @@
VisitDetailVO visitDetailVO = new VisitDetailVO();
visitDetailVO.setCreateTime(visits.getCreateDate());
visitDetailVO.setStatus(visits.getStatus());
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
+ || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfFail)
+ || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)
+ || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signout)
+ || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.invalid)){
+ visitDetailVO.setBusinessStatus(Constants.VisitStatus.pass);
+ }else{
+ visitDetailVO.setBusinessStatus(visits.getStatus());
+ }
visitDetailVO.setCarNos(visits.getCarNos());
visitDetailVO.setPhone(visits.getPhone());
visitDetailVO.setVisitUserName(member.getName());
@@ -1386,6 +1406,40 @@
.eq(Retention::getType,Constants.memberType.visitor)
.eq(Retention::getMemberId,visits.getMemberId()));
}
+ @Override
+ public void visitResend(Integer visitId) {
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName)
+ .selectAs(Member::getHkId,Visits::getReceptMemberHkId)
+ .leftJoin(Member.class,Member::getId,Visits::getReceptMemberId)
+ .eq(Visits::getId,visitId)//鏈悓姝ュ埌娴峰悍
+ .last("limit 1");
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
+ if(Objects.isNull(visits)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!visits.getStatus().equals(Constants.VisitStatus.xfFail)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ }
+ List<DeviceRole> roleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getType, Constants.ONE));
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ HkSyncVisitServiceImpl.getUpdateModelByResponseIccm(visits,new Date(),roleList,path);
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
+ //濡傛灉涓嬪彂鎴愬姛锛�
+ visitsMapper.updateById(visits);
+ if(Objects.isNull(visits.getParentId())){
+ wxPlatNotice.sendVisitAuditTemplateNotice(visits,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"閲嶆柊涓嬪彂浼氬け璐ワ紒");
+ }
+ }
@Override
--
Gitblit v1.9.3