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/RetentionServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index dec9e5e..6339165 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.RetentionMapper;
-import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.join.RetentionJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.RetentionService;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
@@ -26,6 +34,10 @@
@Autowired
private RetentionMapper retentionMapper;
+
+ @Autowired
+ private RetentionJoinMapper retentionJoinMapper;
+
@Override
public Integer create(Retention retention) {
@@ -83,7 +95,7 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Retention> findPage(PageWrap<Retention> pageWrap) {
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -171,4 +183,43 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId)
+ .leftJoin(Member.class,Member::getId,Retention::getMemberId)
+ .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode);
+ queryWrapper.selectAll(Retention.class)
+ .selectAs(Company::getName,Retention::getCompanyName)
+ .selectAs(Member::getType,Retention::getMemberType)
+ .selectAs(DeviceEvent::getSrcName,Retention::getSrcName);
+ queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords())
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),
+ Member::getType,
+ pageWrap.getModel().getType())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ Retention::getEventDate,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ Retention::getEventDate,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ queryWrapper.orderByDesc(Retention::getCreateDate);
+ IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
+ return PageData.from(retentionIPage);
+ }
}
--
Gitblit v1.9.3