From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 070d493..498d6c2 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
@@ -689,7 +689,7 @@
if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
|| Constants.equalsInteger(visits.getType(),Constants.ONE)){
if( visits.getIdcardType() == null
- || StringUtils.isBlank( visits.getIdcardNo() ) || StringUtils.isBlank(visits.getFaceImg()) ){
+ || StringUtils.isBlank(visits.getFaceImg()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}
}
@@ -1867,20 +1867,20 @@
List<InterestedListVO> lwList = new ArrayList<>();
List<InterestedListVO> internalList = new ArrayList<>();
//鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
- List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
- Constants.VisitStatus.signin,Constants.VisitStatus.signout)
- .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
- );
+// List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
+// Constants.VisitStatus.signin,Constants.VisitStatus.signout)
+// .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
+// );
List<InoutRecord> inoutRecordList = inoutRecordMapper.selectList(new QueryWrapper<InoutRecord>().lambda()
.eq(InoutRecord::getInOrOut,Constants.ZERO).eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
+ .apply(" TIME_INFO > CURDATE() - INTERVAL 7 DAY " )
);
- List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
- .in(CarEvent::getEventType,"771760131","771760130")
- .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY " )
- );
+// List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
+// .in(CarEvent::getEventType,"771760131","771760130")
+// .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY " )
+// );
for (String days:weekDays) {
InterestedListVO visitVO = new InterestedListVO();
@@ -1907,6 +1907,7 @@
visitVO.setName(days);
InterestedListVO carVO = new InterestedListVO();
+ carVO.setNum(Constants.ZERO);
carVO.setName(days);
if(CollectionUtils.isNotEmpty(inoutRecordList)){
@@ -1933,11 +1934,8 @@
pcWorkPlatformDataVO.setWeekCarList(weekCarList);
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
- .eq(Company::getType,Constants.ZERO)
.eq(Company::getIsdeleted,Constants.ZERO)
);
-
-
if(CollectionUtils.isNotEmpty(companyList)){
List<Company> lwCompanyList = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
--
Gitblit v1.9.3