From b0f68c57f7699d083818b9837289e4fb5b7cb25c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 09:14:52 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 b20d203..cc46309 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
@@ -1617,7 +1617,8 @@
}
if(!(
CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
- loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){
+ loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel"))
+ .collect(Collectors.toList()).size()>0)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
this.visitsCancelBiz(visits);
@@ -1634,7 +1635,8 @@
.eq(Visits::getId,visits.getId());
//璁垮鎶ュ
if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
- if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
+ if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)
+ ||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
|| Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝鏃犳硶杩涜璇ユ搷浣�");
}
@@ -1757,7 +1759,7 @@
}
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()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
HkSyncVisitServiceImpl.getUpdateModelByResponseIccm(visits,new Date(),roleList,path);
@@ -1895,8 +1897,9 @@
// List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
List<String> memberIds = inoutRecordList.stream().filter(i->
- Objects.isNull(i.getCarCode())&&
- Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+ Objects.isNull(i.getCarCode())
+ && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
+ && Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
.map(i->i.getMemberPhone())
.collect(Collectors.toList());
@@ -1919,10 +1922,11 @@
// List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
// List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
List<String> carCodeList = inoutRecordList.stream().filter(i->
- Objects.isNull(i.getCarCode())&&
- Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+ Objects.nonNull(i.getCarCode())
+ && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
+ && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
- .map(i->i.getMemberPhone())
+ .map(i->i.getCarCode())
.collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(carCodeList)){
carVO.setNum(new HashSet<String>(carCodeList).size());
@@ -1939,6 +1943,7 @@
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Company::getSortnum)
);
if(CollectionUtils.isNotEmpty(companyList)){
--
Gitblit v1.9.3