From 6500da411f234b8ad0ee493909d515bf9eeecdd5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 16 十月 2025 19:28:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 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 cc46309..4ad2587 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
@@ -239,7 +239,7 @@
//妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
ProblemLog problemLog = isValidProblemLog(visits,source);
//鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
- getHkDeviceRoles(visits,isERP);
+// getHkDeviceRoles(visits,isERP);
//妫�楠屾嫓璁夸汉鏄惁鍚堟硶
Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
if(StringUtils.isNotBlank(visits.getIdcardNo()) && Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
@@ -258,24 +258,6 @@
//鍒濆鍖栬瀹俊鎭�
initVisitInfo(visits,date);
-// if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)|| Constants.equalsInteger(visits.getType(),Constants.TWO))){
-// //浜鸿劯璇勫垎
-// FacePictureCheckRequest param = new FacePictureCheckRequest();
-// String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
-// systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
-// param.setFacePicUrl(prefixUrl + visits.getFaceImg());
-// BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
-// if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
-// }
-// FacePictureCheckResponse facePictureCheckResponse = response.getData();
-// if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
-// }
-// if(!facePictureCheckResponse.getCheckResult()){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
-// }
-// }
visits.setSendTimeOutNotice(Constants.ZERO);
visitsMapper.insert(visits);
@@ -1296,6 +1278,7 @@
queryWrapper.selectAll(Visits.class);
queryWrapper.select(" ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null and v.CAR_NOS != '' and v.CAR_NOS != t.CAR_NOS ) as carNum ");
+ queryWrapper.select(" ( select count(distinct(v.id)) from retention v where v.member_id = t.member_id and v.type=1 )",Visits::getRetentionNum);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -1598,12 +1581,15 @@
@Override
- public void visitsSelfCancel(Integer visitId,Integer memberId){
+ public void visitsSelfCancel(Integer visitId,Integer memberId,String openid){
Visits visits = visitsMapper.selectById(visitId);
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
+/* if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
+ }*/
+ if(!StringUtils.equals(openid,visits.getOpenid())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
this.visitsCancelBiz(visits);
@@ -1898,6 +1884,7 @@
List<String> memberIds = inoutRecordList.stream().filter(i->
Objects.isNull(i.getCarCode())
+ && Constants.equalsInteger(i.getMemberType(),Constants.ONE)
&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
&& Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
@@ -1913,6 +1900,8 @@
visitVO.setName(days);
+ weekVisitList.add(visitVO);
+
InterestedListVO carVO = new InterestedListVO();
carVO.setNum(Constants.ZERO);
carVO.setName(days);
@@ -1924,7 +1913,7 @@
List<String> carCodeList = inoutRecordList.stream().filter(i->
Objects.nonNull(i.getCarCode())
&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
- && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+ &&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
.map(i->i.getCarCode())
.collect(Collectors.toList());
@@ -1933,9 +1922,8 @@
}
}
if(Objects.isNull(carVO.getNum())){
- visitVO.setNum(Constants.ZERO);
+ carVO.setNum(Constants.ZERO);
}
- weekVisitList.add(visitVO);
weekCarList.add(carVO);
}
pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
--
Gitblit v1.9.3