From 13ff112e45a64378cdc91aa2f05916721945f08a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 19:22:58 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java | 106 ++++++++++++++++++-----------------------------------
1 files changed, 36 insertions(+), 70 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
index 56982c7..23965eb 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
@@ -2,18 +2,23 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticesMapper;
+import com.doumee.dao.business.join.NoticesJoinMapper;
+import com.doumee.dao.business.model.ApplyChagneDetail;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.Notices;
import com.doumee.service.business.NoticesService;
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.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
import java.util.List;
/**
@@ -25,7 +30,7 @@
public class NoticesServiceImpl implements NoticesService {
@Autowired
- private NoticesMapper noticesMapper;
+ private NoticesJoinMapper noticesMapper;
@Override
public Integer create(Notices notices) {
@@ -87,90 +92,51 @@
@Override
public PageData<Notices> findPage(PageWrap<Notices> pageWrap) {
IPage<Notices> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Notices> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Notices::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Notices::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Notices::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Notices::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Notices::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Notices::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Notices::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
+ queryWrapper.selectAll(Notices.class);
+ queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
+ queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Notices::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(Notices::getTitle, pageWrap.getModel().getTitle());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(Notices::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(Notices::getContent, pageWrap.getModel().getContent());
- }
- if (pageWrap.getModel().getObjId() != null) {
- queryWrapper.lambda().eq(Notices::getObjId, pageWrap.getModel().getObjId());
+ queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getObjType() != null) {
- queryWrapper.lambda().eq(Notices::getObjType, pageWrap.getModel().getObjType());
- }
- if (pageWrap.getModel().getObjName() != null) {
- queryWrapper.lambda().eq(Notices::getObjName, pageWrap.getModel().getObjName());
+ queryWrapper.eq(Notices::getObjType, pageWrap.getModel().getObjType());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Notices::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getParam1() != null) {
- queryWrapper.lambda().eq(Notices::getParam1, pageWrap.getModel().getParam1());
- }
- if (pageWrap.getModel().getParam2() != null) {
- queryWrapper.lambda().eq(Notices::getParam2, pageWrap.getModel().getParam2());
- }
- if (pageWrap.getModel().getParam3() != null) {
- queryWrapper.lambda().eq(Notices::getParam3, pageWrap.getModel().getParam3());
- }
- if (pageWrap.getModel().getParam4() != null) {
- queryWrapper.lambda().eq(Notices::getParam4, pageWrap.getModel().getParam4());
- }
- if (pageWrap.getModel().getParam5() != null) {
- queryWrapper.lambda().eq(Notices::getParam5, pageWrap.getModel().getParam5());
- }
- if (pageWrap.getModel().getUserId() != null) {
- queryWrapper.lambda().eq(Notices::getUserId, pageWrap.getModel().getUserId());
+ queryWrapper.eq(Notices::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(Notices::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(Notices::getCompanyId, pageWrap.getModel().getCompanyId());
}
if (pageWrap.getModel().getPalt() != null) {
- queryWrapper.lambda().eq(Notices::getPalt, pageWrap.getModel().getPalt());
+ queryWrapper.eq(Notices::getPalt, pageWrap.getModel().getPalt());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Notices::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(Notices::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getReaded() != null) {
- queryWrapper.lambda().eq(Notices::getReaded, pageWrap.getModel().getReaded());
+ queryWrapper.eq(Notices::getReaded, pageWrap.getModel().getReaded());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
}
+ }else{
+ queryWrapper.orderByDesc(Notices::getCreateDate);
}
- return PageData.from(noticesMapper.selectPage(page, queryWrapper));
+
+ PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
+ pageData.getRecords().forEach(i->{
+ i.setTypeDetail(
+ Constants.NoticeType.getDetail(i.getObjType(),i.getType())
+ );
+ });
+ return pageData;
}
@Override
--
Gitblit v1.9.3