From 5587f3aede4d4d373835fa7e48a4cff229021ac8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 四月 2025 11:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 79 +++++----------------------------------
1 files changed, 10 insertions(+), 69 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 36aae5b..eb7761d 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -487,6 +487,11 @@
@Override
public List<Workorder> findList(Workorder pageWrap) {
+
+ return workorderMapper.selectJoinList(Workorder.class,getJoinQueryMapper(pageWrap));
+ }
+
+ private MPJLambdaWrapper<Workorder> getJoinQueryMapper(Workorder pageWrap) {
MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
pageWrap.setIsdeleted(Constants.ZERO);
queryWrapper
@@ -494,11 +499,11 @@
.selectAs(Member::getName,Workorder::getMemberName)
.selectAs(Member::getCompanyName,Workorder::getCompanyName)
.selectAs(Member::getPhone,Workorder::getMemberPhone)
+ .select(" c2.name ",Workorder::getCategoryName)
.select(" c3.name ",Workorder::getTypeName)
- .select(" c4.name ",Workorder::getProblemName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
- .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
+ .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA涓�绾ч棶棰樼紪鐮�
.eq( pageWrap.getId() != null, Workorder::getId, pageWrap.getId())
.eq( pageWrap.getCreator() != null, Workorder::getCreator, pageWrap.getCreator())
.ge( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart( pageWrap.getCreateDate()))
@@ -551,79 +556,15 @@
.or().like(Member::getPhone, pageWrap.getMemberName()) );
}
queryWrapper.orderByDesc(Workorder::getProblemId);
- return workorderMapper.selectJoinList(Workorder.class,queryWrapper);
+ return queryWrapper;
}
-
+
@Override
public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
Utils.MP.blankToNull(pageWrap.getModel());
- MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
pageWrap.getModel().setIsdeleted(Constants.ZERO);
- queryWrapper
- .selectAll(Workorder.class)
- .selectAs(Member::getName,Workorder::getMemberName)
- .selectAs(Member::getCompanyName,Workorder::getCompanyName)
- .selectAs(Member::getPhone,Workorder::getMemberPhone)
- .select(" c2.name ",Workorder::getCategoryName)
- .select(" c3.name ",Workorder::getTypeName)
- .select(" c4.name ",Workorder::getProblemName)
- .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
- .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
- .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
- .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA闂缂栫爜
- .eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId())
- .eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator())
- .ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
- .le(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
- .eq(pageWrap.getModel().getEditor() != null, Workorder::getEditor, pageWrap.getModel().getEditor())
- .ge(pageWrap.getModel().getEditDate() != null, Workorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
- .le(pageWrap.getModel().getEditDate() != null, Workorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
- .eq(pageWrap.getModel().getIsdeleted() != null, Workorder::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getCategoryId() != null, Workorder::getCategoryId, pageWrap.getModel().getCategoryId())
- .eq(pageWrap.getModel().getRemark() != null, Workorder::getRemark, pageWrap.getModel().getRemark())
- .eq(pageWrap.getModel().getStatus() != null, Workorder::getStatus, pageWrap.getModel().getStatus())
- .eq(pageWrap.getModel().getSortnum() != null, Workorder::getSortnum, pageWrap.getModel().getSortnum())
- .eq(pageWrap.getModel().getType() != null, Workorder::getType, pageWrap.getModel().getType())
- .eq(pageWrap.getModel().getMemberId() != null, Workorder::getMemberId, pageWrap.getModel().getMemberId())
- .eq(pageWrap.getModel().getCompanyId() != null, Workorder::getCompanyId, pageWrap.getModel().getCompanyId())
- .eq(pageWrap.getModel().getSubmitDate() != null, Workorder::getSubmitDate, pageWrap.getModel().getSubmitDate())
- .eq(pageWrap.getModel().getMemberType() != null, Workorder::getMemberType, pageWrap.getModel().getMemberType())
- .eq(pageWrap.getModel().getMemberQwids() != null, Workorder::getMemberQwids, pageWrap.getModel().getMemberQwids())
- .like(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames())
- .eq(pageWrap.getModel().getLocaltionId() != null, Workorder::getLocaltionId, pageWrap.getModel().getLocaltionId())
- .eq(pageWrap.getModel().getOutJiuyi() != null, Workorder::getOutJiuyi, pageWrap.getModel().getOutJiuyi())
- .eq(pageWrap.getModel().getIsYiwushi() != null, Workorder::getIsYiwushi, pageWrap.getModel().getIsYiwushi())
- .eq(pageWrap.getModel().getIsHurted() != null, Workorder::getIsHurted, pageWrap.getModel().getIsHurted())
- .eq(pageWrap.getModel().getWorkRelated() != null, Workorder::getWorkRelated, pageWrap.getModel().getWorkRelated())
- .eq(pageWrap.getModel().getEventInfo() != null, Workorder::getEventInfo, pageWrap.getModel().getEventInfo())
- .eq(pageWrap.getModel().getEmialMemberIds() != null, Workorder::getEmialMemberIds, pageWrap.getModel().getEmialMemberIds())
- .eq(pageWrap.getModel().getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds, pageWrap.getModel().getQwnoticeMemberIds())
- .eq(pageWrap.getModel().getHappenTime() != null, Workorder::getHappenTime, pageWrap.getModel().getHappenTime())
- .eq(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, pageWrap.getModel().getTypeId())
- .eq(pageWrap.getModel().getRiskInfo() != null, Workorder::getRiskInfo, pageWrap.getModel().getRiskInfo())
- .eq(pageWrap.getModel().getManagerId() != null, Workorder::getManagerId, pageWrap.getModel().getManagerId())
- .eq(pageWrap.getModel().getDealerId() != null, Workorder::getDealerId, pageWrap.getModel().getDealerId())
- .ge(pageWrap.getModel().getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getStart(pageWrap.getModel().getDispatchTime()))
- .le(pageWrap.getModel().getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getEnd(pageWrap.getModel().getDispatchTime()))
- .eq(pageWrap.getModel().getDispatchInfo() != null, Workorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo())
- .ge(pageWrap.getModel().getDealTime() != null, Workorder::getDealTime, Utils.Date.getStart(pageWrap.getModel().getDealTime()))
- .le(pageWrap.getModel().getDealTime() != null, Workorder::getDealTime, Utils.Date.getEnd(pageWrap.getModel().getDealTime()))
- .eq(pageWrap.getModel().getDealInfo() != null, Workorder::getDealInfo, pageWrap.getModel().getDealInfo())
- .eq(pageWrap.getModel().getProblemTitle() != null, Workorder::getProblemTitle, pageWrap.getModel().getProblemTitle())
- .eq(pageWrap.getModel().getProblemId() != null, Workorder::getProblemId, pageWrap.getModel().getProblemId())
- .eq(pageWrap.getModel().getProblemInfo() != null, Workorder::getProblemInfo, pageWrap.getModel().getProblemInfo())
- .eq(pageWrap.getModel().getLocationName() != null, Workorder::getLocationName, pageWrap.getModel().getLocationName())
- .like(pageWrap.getModel().getCode() != null, Workorder::getCode, pageWrap.getModel().getCode())
- .eq(pageWrap.getModel().getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getModel().getDcaYesNum())
- .eq(pageWrap.getModel().getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getModel().getDcaNoNum())
- .eq(pageWrap.getModel().getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getModel().getDcaRecordId())
- .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ;
- if (pageWrap.getModel().getMemberName() != null) {
- queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
- .or().like(Member::getPhone,pageWrap.getModel().getMemberName()) );
- }
- queryWrapper.orderByDesc(Workorder::getCreateDate);
+ MPJLambdaWrapper<Workorder> queryWrapper = getJoinQueryMapper(pageWrap.getModel());
return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper));
}
--
Gitblit v1.9.3