From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
index 5811b1b..17d2a74 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
@@ -5,7 +5,8 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.model.PlatformLog;
+import com.doumee.dao.business.join.PlatformLogJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.openapi.request.CarLogsListRequest;
import com.doumee.dao.openapi.response.CarLogsListResponse;
import com.doumee.service.business.PlatformLogService;
@@ -13,6 +14,8 @@
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.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -32,6 +35,9 @@
@Autowired
private PlatformLogMapper platformLogMapper;
+
+ @Autowired
+ private PlatformLogJoinMapper platformLogJoinMapper;
@Override
public Integer create(PlatformLog platformLog) {
@@ -93,30 +99,27 @@
@Override
public PageData<PlatformLog> findPage(PageWrap<PlatformLog> pageWrap) {
IPage<PlatformLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<PlatformLog> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<PlatformLog> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
- .eq(pageWrap.getModel().getId() != null, PlatformLog::getId, pageWrap.getModel().getId())
- .eq(pageWrap.getModel().getCreator() != null, PlatformLog::getCreator, pageWrap.getModel().getCreator())
- .ge(pageWrap.getModel().getCreateDate() != null, PlatformLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
- .le(pageWrap.getModel().getCreateDate() != null, PlatformLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
- .eq(pageWrap.getModel().getEditor() != null, PlatformLog::getEditor, pageWrap.getModel().getEditor())
- .ge(pageWrap.getModel().getEditDate() != null, PlatformLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
- .le(pageWrap.getModel().getEditDate() != null, PlatformLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
- .eq(pageWrap.getModel().getIsdeleted() != null, PlatformLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getRemark() != null, PlatformLog::getRemark, pageWrap.getModel().getRemark())
- .eq(pageWrap.getModel().getJobId() != null, PlatformLog::getJobId, pageWrap.getModel().getJobId())
- .eq(pageWrap.getModel().getTitle() != null, PlatformLog::getTitle, pageWrap.getModel().getTitle())
- .eq(pageWrap.getModel().getContent() != null, PlatformLog::getContent, pageWrap.getModel().getContent())
- .eq(pageWrap.getModel().getObjType() != null, PlatformLog::getObjType, pageWrap.getModel().getObjType())
- .eq(pageWrap.getModel().getObjId() != null, PlatformLog::getObjId, pageWrap.getModel().getObjId())
- .eq(pageWrap.getModel().getBeforeContent() != null, PlatformLog::getBeforeContent, pageWrap.getModel().getBeforeContent())
- .eq(pageWrap.getModel().getAfterContent() != null, PlatformLog::getAfterContent, pageWrap.getModel().getAfterContent())
- .eq(pageWrap.getModel().getParam1() != null, PlatformLog::getParam1, pageWrap.getModel().getParam1())
- .eq(pageWrap.getModel().getParam2() != null, PlatformLog::getParam2, pageWrap.getModel().getParam2())
- .eq(pageWrap.getModel().getParam3() != null, PlatformLog::getParam3, pageWrap.getModel().getParam3())
- .eq(pageWrap.getModel().getParam4() != null, PlatformLog::getParam4, pageWrap.getModel().getParam4())
+
+ queryWrapper.selectAll(PlatformLog.class)
+ .selectAs(Platform::getName,PlatformLog::getPlatformName)
+ .selectAs(PlatformGroup::getName,PlatformLog::getPlatformGroupName)
+ .selectAs(PlatformJob::getCarCodeFront,PlatformLog::getCarCodeFront)
+ .selectAs(PlatformJob::getCarCodeBack,PlatformLog::getCarCodeBack)
+ .selectAs(PlatformJob::getBillCode,PlatformLog::getBillCode)
+ .selectAs(PlatformJob::getContractNum,PlatformLog::getContractNum)
+ .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformLog::getJobId)
+ .leftJoin(Platform.class,Platform::getId,PlatformLog::getRemark)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .like(pageWrap.getModel().getPlatformName() != null, Platform::getName, pageWrap.getModel().getPlatformName())
+ .eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformGroup::getId, pageWrap.getModel().getPlatformGroupId())
+ .like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
+ .ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformLog::getParam1, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
+ .le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformLog::getParam2, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
+ .apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.OBJ_TYPE,'"+pageWrap.getModel().getQueryStatus()+"') and t.remark is not null ")
;
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -124,7 +127,13 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformLogMapper.selectPage(page, queryWrapper));
+ IPage<PlatformLog> platformJobIPage = platformLogJoinMapper.selectJoinPage(page,PlatformLog.class,queryWrapper);
+ for (PlatformLog platformLog:platformJobIPage.getRecords()) {
+ if(StringUtils.isBlank(platformLog.getBillCode())){
+ platformLog.setBillCode(platformLog.getContractNum());
+ }
+ }
+ return PageData.from(platformJobIPage);
}
@Override
--
Gitblit v1.9.3