From cab7c09647d834c40b727018ecb0d566e8ba159f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:58:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 109 +++++++++++++++---------------------------------------
1 files changed, 30 insertions(+), 79 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index 9791dcb..bd7d8a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -11,6 +11,7 @@
import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.InoutRecord;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.service.business.InoutRecordService;
@@ -115,76 +116,27 @@
@Override
public PageData<InoutRecord> findPage(PageWrap<InoutRecord> pageWrap) {
IPage<InoutRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<InoutRecord> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(InoutRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(InoutRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(InoutRecord::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(InoutRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(InoutRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(InoutRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(InoutRecord::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(InoutRecord::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getHkEventId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getHkEventId, pageWrap.getModel().getHkEventId());
- }
- if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getHkId, pageWrap.getModel().getHkId());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getCarId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCarId, pageWrap.getModel().getCarId());
- }
- if (pageWrap.getModel().getCategoryId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCategoryId, pageWrap.getModel().getCategoryId());
- }
- if (pageWrap.getModel().getCategoryName() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCategoryName, pageWrap.getModel().getCategoryName());
- }
- if (pageWrap.getModel().getCarBizType() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCarBizType, pageWrap.getModel().getCarBizType());
- }
- if (pageWrap.getModel().getMemberType() != null) {
- queryWrapper.lambda().eq(InoutRecord::getMemberType, pageWrap.getModel().getMemberType());
- }
- if (pageWrap.getModel().getMemberName() != null) {
- queryWrapper.lambda().eq(InoutRecord::getMemberName, pageWrap.getModel().getMemberName());
- }
- if (pageWrap.getModel().getCarCode() != null) {
- queryWrapper.lambda().eq(InoutRecord::getCarCode, pageWrap.getModel().getCarCode());
- }
- if (pageWrap.getModel().getObjType() != null) {
- queryWrapper.lambda().eq(InoutRecord::getObjType, pageWrap.getModel().getObjType());
- }
- if (pageWrap.getModel().getObjId() != null) {
- queryWrapper.lambda().eq(InoutRecord::getObjId, pageWrap.getModel().getObjId());
- }
- if (pageWrap.getModel().getInOrOut() != null) {
- queryWrapper.lambda().eq(InoutRecord::getInOrOut, pageWrap.getModel().getInOrOut());
- }
- if (pageWrap.getModel().getDeviceName() != null) {
- queryWrapper.lambda().eq(InoutRecord::getDeviceName, pageWrap.getModel().getDeviceName());
- }
+ InoutRecord model = pageWrap.getModel();
+ queryWrapper.selectAll(InoutRecord.class)
+ .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+// .eq(Objects.nonNull(model.getType()),InoutRecord::getType, model.getType())
+ .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ZERO),InoutRecord::getCarCode)
+ .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ONE),InoutRecord::getMemberPhone)
+ .eq(Objects.nonNull(model.getInOrOut()),InoutRecord::getInOrOut, model.getInOrOut())
+ .eq(Objects.nonNull(model.getObjType()),InoutRecord::getObjType, model.getObjType())
+ .eq(Objects.nonNull(model.getCarBizType()),InoutRecord::getCarBizType, model.getCarBizType())
+ .eq(Objects.nonNull(model.getMemberType()),InoutRecord::getMemberType, model.getMemberType())
+ .ge(Objects.nonNull(model.getStartDate()),InoutRecord::getCreateDate, Utils.Date.getStart(model.getStartDate()))
+ .le(Objects.nonNull(model.getEndDate()),InoutRecord::getCreateDate, Utils.Date.getEnd(model.getEndDate()))
+ .and(StringUtils.isNotBlank(model.getCategoryName()),i->i.like(InoutRecord::getCategoryName,model.getCategoryName()).or().like(InoutRecord::getCategoryParentName,model.getCategoryName()))
+ .and(StringUtils.isNotBlank(model.getMemberName()),i->i.like(InoutRecord::getMemberName,model.getMemberName()).or().like(InoutRecord::getMemberPhone,model.getMemberName()))
+ .and(StringUtils.isNotBlank(model.getCarCode()),i->i.like(InoutRecord::getCarCode,model.getCarCode()).or().like(InoutRecord::getRemark,model.getCarCode()))
+ .like(StringUtils.isNotBlank(model.getCompanyName()),InoutRecord::getCompanyName,model.getCompanyName())
+ .like(StringUtils.isNotBlank(model.getDeviceName()),InoutRecord::getDeviceName,model.getDeviceName())
+ .orderByDesc(InoutRecord::getId)
+ ;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -351,7 +303,8 @@
rataList.add(generalDataVO);
}
}else{
- List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName())).map(i->i.getCategoryParentName()).collect(Collectors.toList());
+ List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName()))
+ .map(i->i.getCategoryParentName()).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryNameList)){
Set<String> setList = new HashSet<>(categoryNameList);
for (String categoryName:setList) {
@@ -402,7 +355,7 @@
if(Constants.equalsInteger(DateUtil.getNowYearNum(),Integer.valueOf(inParkDataDTO.getDateStr()))){
maxMonth = DateUtil.getNowMonthNum();
}
- for (int i = maxMonth; i >=0 ; i--) {
+ for (int i = maxMonth; i >0 ; i--) {
dateList.add(DateUtil.getNowYearNum()+"-"+ StringUtils.leftPad(i+"",2,"0"));
}
}else {
@@ -420,7 +373,7 @@
lastDay = today;
}
}
- for (int i = lastDay; i >= 0 ; i--) {
+ for (int i = lastDay; i > 0 ; i--) {
dateList.add(year + "-" + StringUtils.leftPad(month.toString(),2,"0") + "-" + StringUtils.leftPad(Integer.toString(i),2,"0"));
}
}
@@ -443,11 +396,11 @@
}
totalString.add("鍚堣");
resultList.add(totalString);
- Integer total = 0;
for (String str:dataList) {
+ Integer total = 0;
+ List<String> dataChildList = new ArrayList<>();
+ dataChildList.add(str);
for (String categoryName:setList) {
- List<String> dataChildList = new ArrayList<>();
- dataChildList.add(str);
if(Constants.equalsInteger(dateStr.length(),4)){
Integer childNum = allList.stream().filter(i->categoryName.equals(i.getCategoryName())
&& DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(str)).collect(Collectors.toList()).size();
@@ -463,9 +416,9 @@
);
total = total + childNum;
}
- dataChildList.add(Integer.toString(total));
- resultList.add(dataChildList);
}
+ dataChildList.add(Integer.toString(total));
+ resultList.add(dataChildList);
}
}else{
for (int j = 0; j < userTypeList.length; j++) {
@@ -526,7 +479,6 @@
person -> person,
(existing, replacement) -> existing
));
-
List<InoutRecord> uniqueList = new ArrayList<>(uniqueByMemberPhone.values());
return uniqueList;
}
@@ -538,7 +490,6 @@
person -> person,
(existing, replacement) -> existing
));
-
List<InoutRecord> uniqueList = new ArrayList<>(uniqueByCarCode.values());
return uniqueList;
}
--
Gitblit v1.9.3