From 6f1416efc5fa001bcbae7cbbd086d3ad2a6b3292 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 13 九月 2024 16:08:28 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 4 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitParkJoinMapper.java | 13 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java | 23 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java | 64 +++++++++++++++-----------------
5 files changed, 69 insertions(+), 36 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitParkJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitParkJoinMapper.java
new file mode 100644
index 0000000..5367604
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitParkJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.VisitPark;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @since 2024/04/28 15:44
+ */
+public interface VisitParkJoinMapper extends MPJJoinMapper<VisitPark> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
index 2a4c837..4a62ca8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -90,4 +91,26 @@
@ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
private String parkHkId;
+ @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1")
+ @TableField(exist = false)
+ private String parksName;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @TableField(exist = false)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "閮ㄩ棬", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index b5408ac..2d27a3b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -144,8 +144,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index ca8f763..c483aca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -343,6 +343,7 @@
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
index ce13cd4..4b60a4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
@@ -4,12 +4,15 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitParkMapper;
-import com.doumee.dao.business.model.VisitPark;
+import com.doumee.dao.business.join.VisitParkJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.VisitParkService;
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;
@@ -26,6 +29,9 @@
@Autowired
private VisitParkMapper visitParkMapper;
+
+ @Autowired
+ private VisitParkJoinMapper visitParkJoinMapper;
@Override
public Integer create(VisitPark visitPark) {
@@ -87,40 +93,30 @@
@Override
public PageData<VisitPark> findPage(PageWrap<VisitPark> pageWrap) {
IPage<VisitPark> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<VisitPark> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
- .eq(pageWrap.getModel().getId() != null, VisitPark::getId, pageWrap.getModel().getId())
- .eq(pageWrap.getModel().getCreator() != null, VisitPark::getCreator, pageWrap.getModel().getCreator())
- .ge(pageWrap.getModel().getCreateDate() != null, VisitPark::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
- .le(pageWrap.getModel().getCreateDate() != null, VisitPark::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
- .eq(pageWrap.getModel().getEditor() != null, VisitPark::getEditor, pageWrap.getModel().getEditor())
- .ge(pageWrap.getModel().getEditDate() != null, VisitPark::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
- .le(pageWrap.getModel().getEditDate() != null, VisitPark::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
- .eq(pageWrap.getModel().getIsdeleted() != null, VisitPark::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getRemark() != null, VisitPark::getRemark, pageWrap.getModel().getRemark())
- .eq(pageWrap.getModel().getParkId() != null, VisitPark::getParkId, pageWrap.getModel().getParkId())
- .eq(pageWrap.getModel().getSortnum() != null, VisitPark::getSortnum, pageWrap.getModel().getSortnum())
- .eq(pageWrap.getModel().getVisitApplyId() != null, VisitPark::getVisitApplyId, pageWrap.getModel().getVisitApplyId())
- .eq(pageWrap.getModel().getCarCode() != null, VisitPark::getCarCode, pageWrap.getModel().getCarCode())
- .eq(pageWrap.getModel().getHkId() != null, VisitPark::getHkId, pageWrap.getModel().getHkId())
- .eq(pageWrap.getModel().getHkStatus() != null, VisitPark::getHkStatus, pageWrap.getModel().getHkStatus())
- .ge(pageWrap.getModel().getHkDate() != null, VisitPark::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()))
- .le(pageWrap.getModel().getHkDate() != null, VisitPark::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()))
- .ge(pageWrap.getModel().getStartTime() != null, VisitPark::getStartTime, Utils.Date.getStart(pageWrap.getModel().getStartTime()))
- .le(pageWrap.getModel().getStartTime() != null, VisitPark::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTime()))
- .ge(pageWrap.getModel().getEndTime() != null, VisitPark::getEndTime, Utils.Date.getStart(pageWrap.getModel().getEndTime()))
- .le(pageWrap.getModel().getEndTime() != null, VisitPark::getEndTime, Utils.Date.getEnd(pageWrap.getModel().getEndTime()))
- .eq(pageWrap.getModel().getParkHkId() != null, VisitPark::getParkHkId, pageWrap.getModel().getParkHkId())
+ MPJLambdaWrapper<VisitPark> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(VisitPark.class);
+ queryWrapper.selectAs(Parks::getName, VisitPark::getParksName);
+ queryWrapper.selectAs(Member::getType,VisitPark::getMemberType);
+ queryWrapper.selectAs(Member::getName,VisitPark::getMemberName);
+ queryWrapper.selectAs(Member::getPhone,VisitPark::getMemberPhone);
+ queryWrapper.selectAs(Company::getName,VisitPark::getCompanyName);
+
+ queryWrapper.leftJoin(Visits.class,Visits::getId,VisitPark::getVisitApplyId);
+ queryWrapper.leftJoin(Parks.class,Parks::getId,VisitPark::getParkId);
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+ queryWrapper
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName())
+ .or().like(Member::getName,pageWrap.getModel().getMemberName()));
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),VisitPark::getCarCode,pageWrap.getModel().getCarCode());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParksName()),Parks::getName,pageWrap.getModel().getParksName());
+ queryWrapper.orderByDesc(VisitPark::getCreateDate)
;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(visitParkMapper.selectPage(page, queryWrapper));
+ IPage<VisitPark> result = visitParkJoinMapper.selectJoinPage(page, VisitPark.class,queryWrapper);
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3