From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 159 ++++++++++++++++++++++++----------------------------
1 files changed, 73 insertions(+), 86 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 9a268c9..7426367 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());
@@ -379,21 +331,60 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- List<InoutRecord> allList = inoutRecordMapper.selectJoinList(InoutRecord.class,new MPJLambdaWrapper<InoutRecord>()
- .selectAll(InoutRecord.class)
- .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+ List<InoutRecord> allList = new ArrayList<>();
+ MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<InoutRecord>().eq(InoutRecord::getIsdeleted,Constants.ZERO)
.eq(InoutRecord::getInOrOut,Constants.ZERO)
.isNotNull(Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO),InoutRecord::getCarCode)
.isNotNull(Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE),InoutRecord::getMemberPhone)
.apply(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)," ( DATE_FORMAT(CREATE_DATE, '%Y') = '"+inParkDataDTO.getDateStr()+"' ) ")
- .apply(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)," ( DATE_FORMAT(CREATE_DATE, '%Y-%m') = '"+inParkDataDTO.getDateStr()+"' ) ")
- );
+ .apply(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)," ( DATE_FORMAT(CREATE_DATE, '%Y-%m') = '"+inParkDataDTO.getDateStr()+"' ) ");
+ if(Constants.equalsInteger(inParkDataDTO.getIsGroupBy(),Constants.ONE)){
+ mpjLambdaWrapper.groupBy(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO),
+ "car_code,category_name,DATE_FORMAT(CREATE_DATE, '%Y-%m')")
+ .groupBy(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO),
+ "car_code,category_name,DATE_FORMAT(CREATE_DATE, '%Y-%m-%d')")
+ .groupBy(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE),
+ "member_phone,MEMBER_TYPE,DATE_FORMAT(CREATE_DATE, '%Y-%m')")
+ .groupBy(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE),
+ "member_phone,MEMBER_TYPE,DATE_FORMAT(CREATE_DATE, '%Y-%m-%d')");
+ if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO)){
+ mpjLambdaWrapper.select("car_code,category_name,DATE_FORMAT(CREATE_DATE, '%Y-%m') as createDateStr ");
+ }else if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO)){
+ mpjLambdaWrapper.select("car_code,category_name,DATE_FORMAT(CREATE_DATE, '%Y-%m-%d') as createDateStr ");
+ }else if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE)){
+
+ mpjLambdaWrapper.select("member_phone,MEMBER_TYPE,DATE_FORMAT(CREATE_DATE, '%Y-%m') as createDateStr");
+ }else{
+ mpjLambdaWrapper.select("member_phone,MEMBER_TYPE,DATE_FORMAT(CREATE_DATE, '%Y-%m-%d') as createDateStr ");
+ }
+
+ }else{
+ mpjLambdaWrapper.selectAll(InoutRecord.class);
+ if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO)){
+ mpjLambdaWrapper.select("DATE_FORMAT(CREATE_DATE, '%Y-%m') as createDateStr ");
+ }else if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO)){
+ mpjLambdaWrapper.select("DATE_FORMAT(CREATE_DATE, '%Y-%m-%d') as createDateStr ");
+ }else if(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)&&Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE)){
+
+ mpjLambdaWrapper.select("DATE_FORMAT(CREATE_DATE, '%Y-%m') as createDateStr");
+ }else{
+ mpjLambdaWrapper.select("DATE_FORMAT(CREATE_DATE, '%Y-%m-%d') as createDateStr ");
+ }
+// allList = inoutRecordMapper.selectJoinList(InoutRecord.class,new MPJLambdaWrapper<InoutRecord>()
+// .selectAll(InoutRecord.class)
+// .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+// .eq(InoutRecord::getInOrOut,Constants.ZERO)
+// .isNotNull(Constants.equalsInteger(inParkDataDTO.getType(),Constants.ZERO),InoutRecord::getCarCode)
+// .isNotNull(Constants.equalsInteger(inParkDataDTO.getType(),Constants.ONE),InoutRecord::getMemberPhone)
+// .apply(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),4)," ( DATE_FORMAT(CREATE_DATE, '%Y') = '"+inParkDataDTO.getDateStr()+"' ) ")
+// .apply(Constants.equalsInteger(inParkDataDTO.getDateStr().length(),7)," ( DATE_FORMAT(CREATE_DATE, '%Y-%m') = '"+inParkDataDTO.getDateStr()+"' ) ")
+// );
+ }
+ allList = inoutRecordMapper.selectJoinList(InoutRecord.class,mpjLambdaWrapper);
+
List<List<String>> resultList = new ArrayList<>();
if(CollectionUtils.isEmpty(allList)){
return resultList;
- }
- if(Constants.equalsInteger(inParkDataDTO.getIsGroupBy(),Constants.ONE)){
- allList = this.getListByType(allList,inParkDataDTO.getType());
}
List<String> dateList = new ArrayList<>();
@@ -432,7 +423,7 @@
public List<List<String>> dealResultData(List<InoutRecord> allList,List<String> dataList ,Integer type,String dateStr){
List<List<String>> resultList = new ArrayList<>();
List<String> totalString = new ArrayList<>();
- totalString.add("鏃ユ湡");
+ totalString.add("鏁版嵁鏃ユ湡");
if(Constants.equalsInteger(type,Constants.ZERO)){
List<String> categoryNameList = allList.stream().filter(j-> StringUtils.isNotBlank(j.getCategoryName())).map(j->j.getCategoryName()).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(categoryNameList)){
@@ -451,14 +442,14 @@
for (String categoryName:setList) {
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();
+ && i.getCreateDateStr().equals(str)).collect(Collectors.toList()).size();
dataChildList.add(
Integer.toString(childNum)
);
total = total + childNum;
}else if(Constants.equalsInteger(dateStr.length(),7)){
Integer childNum = allList.stream().filter(i->categoryName.equals(i.getCategoryName())
- &&DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(str)).collect(Collectors.toList()).size();
+ &&i.getCreateDateStr().equals(str)).collect(Collectors.toList()).size();
dataChildList.add(
Integer.toString(childNum)
);
@@ -489,14 +480,14 @@
int finalI = i;
if(Constants.equalsInteger(dateStr.length(),4)){
Integer childNum = allList.stream().filter(j->Constants.equalsInteger(j.getMemberType(), finalI)
- && DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(str)).collect(Collectors.toList()).size();
+ && j.getCreateDateStr().equals(str)).collect(Collectors.toList()).size();
dataChildList.add(
Integer.toString(childNum)
);
total = total + childNum;
}else if(Constants.equalsInteger(dateStr.length(),7)){
Integer childNum = allList.stream().filter(j->Constants.equalsInteger(j.getMemberType(), finalI)
- &&DateUtil.formatDate(j.getCreateDate(),"yyyy-MM-dd").equals(str)).collect(Collectors.toList()).size();
+ &&j.getCreateDateStr().equals(str)).collect(Collectors.toList()).size();
dataChildList.add(
Integer.toString(childNum)
);
@@ -509,10 +500,6 @@
}
return resultList;
}
-
-
-
-
public List<InoutRecord> getListByType(List<InoutRecord> list,Integer type){
--
Gitblit v1.9.3