From 57b1d0498e3832478986fbd1277bfe278cea816a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 12 一月 2026 09:39:30 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 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 f4b8bb7..9eab6cf 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);
@@ -289,7 +271,7 @@
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
- }else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
+ }else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO) || dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
visits.setStatus(Constants.VisitStatus.waitCheck);
visitsMapper.updateById(visits);
approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),member);
@@ -1870,7 +1852,8 @@
pcWorkPlatformDataVO.setTodayOutUserNum(pcWorkPlatformDataVO.getLwUserOutNum() + pcWorkPlatformDataVO.getSignLevelNum() + inoutDayCount.getOutSelfMemberNum() );
}
- }else if(Constants.equalsInteger(queryType,Constants.TWO)){
+ }
+ else if(Constants.equalsInteger(queryType,Constants.TWO)){
List<String> weekDays = DateUtil.getBeforDays(new Date(),7);
List<InterestedListVO> weekVisitList = new ArrayList<>();
List<InterestedListVO> weekCarList = new ArrayList<>();
@@ -1902,6 +1885,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)
)
@@ -1917,6 +1901,8 @@
visitVO.setName(days);
+ weekVisitList.add(visitVO);
+
InterestedListVO carVO = new InterestedListVO();
carVO.setNum(Constants.ZERO);
carVO.setName(days);
@@ -1928,7 +1914,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());
@@ -1937,9 +1923,8 @@
}
}
if(Objects.isNull(carVO.getNum())){
- visitVO.setNum(Constants.ZERO);
+ carVO.setNum(Constants.ZERO);
}
- weekVisitList.add(visitVO);
weekCarList.add(carVO);
}
pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
@@ -1993,7 +1978,8 @@
}
pcWorkPlatformDataVO.setInternalList(internalList);
pcWorkPlatformDataVO.setLwList(lwList);
- }else if(Constants.equalsInteger(queryType,Constants.THREE)) {
+ }
+ else if(Constants.equalsInteger(queryType,Constants.THREE)) {
if (Objects.isNull(loginUserInfo.getMemberId())) {
pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
pcWorkPlatformDataVO.setNoticesNum(0);
@@ -2016,7 +2002,8 @@
}
}
- }else{
+ }
+ else{
String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
--
Gitblit v1.9.3