From d326a61865ab19e364934b8d2e1a6a207132620b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 18:02:47 +0800
Subject: [PATCH] #答题日志数据转换 字段映射修改
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index a14ea39..a9e946f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -3,13 +3,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.CarsQuery;
+import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.CarsMapper;
-import com.doumee.dao.business.model.Cars;
+import com.doumee.dao.business.join.ParkBookJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +30,9 @@
@Autowired
private CarsMapper carsMapper;
+
+ @Autowired
+ private ParkBookJoinMapper parkBookJoinMapper;
@Override
public Integer create(Cars cars) {
@@ -83,7 +90,7 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -161,4 +168,30 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap) {
+ MPJLambdaWrapper<ParkBook> wrapper = new MPJLambdaWrapper<>();
+ IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ Utils.MP.blankToNull(pageWrap.getModel());
+ wrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
+ wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
+ .selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(ParkBook::getRemark,CarsDTO::getRemark)
+ .selectAs(Parks::getName,CarsDTO::getParkName)
+ .selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
+ .selectAs(Member::getName,CarsDTO::getMemberName)
+ .selectAs(Member::getType,CarsDTO::getMemberType)
+ .selectAs(Company::getName,CarsDTO::getCompanyName)
+ .selectAs(ParkBook::getTimeType,CarsDTO::getTimeType)
+ .selectAs(ParkBook::getStartTime,CarsDTO::getStartTime)
+ .selectAs(ParkBook::getEndTime,CarsDTO::getEndTime)
+ .selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
+ wrapper.orderByDesc(ParkBook::getCreateDate);
+ IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
+
+ return PageData.from(carsDTOIPage);
+ }
}
--
Gitblit v1.9.3