From dfa179b30b76044bc576e68e72b6cf725bddbd2e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 18:13:11 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 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 a89cd1a..692355d 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
@@ -162,16 +162,12 @@
Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
new MPJLambdaWrapper<Workorder>()
.selectAll(Workorder.class)
+ .selectAs(Member::getPhone,Workorder::getMemberPhone)
.selectAs(Member::getName,Workorder::getMemberName)
- .selectAs(Company::getNamePath,Workorder::getCompanyName)
- .select(" c1.name ",Workorder::getHurtTypeName)
- .select(" c2.name ",Workorder::getLocationTypeName)
+ .selectAs(Workorder::getCompanyName,Workorder::getCompanyName)
.select(" c3.name ",Workorder::getTypeName)
.select(" c4.name ",Workorder::getProblemName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(" category c1 on t.CATEGORY_ID = c1.id ") //鍙椾激绫诲埆
- .leftJoin(" category c2 on t.LOCALTION_ID = c2.id ") //鍙戠敓鍦扮偣
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
.leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
.eq(Workorder::getId,id)
@@ -197,14 +193,8 @@
workorder.setMultifileList(multifileList);
}
}
-
-
return workorder;
}
-
-
-
-
@Override
public void deleteById(Integer id) {
@@ -260,9 +250,19 @@
@Override
public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Workorder> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
+ 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(" 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闂缂栫爜
.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()))
@@ -281,7 +281,7 @@
.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())
- .eq(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames())
+ .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())
@@ -291,8 +291,7 @@
.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())
- .ge(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getStart(pageWrap.getModel().getTypeId()))
- .le(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getEnd(pageWrap.getModel().getTypeId()))
+ .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())
@@ -310,16 +309,9 @@
.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())
- ;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(workorderMapper.selectPage(page, queryWrapper));
+ .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ;
+ queryWrapper.orderByDesc(Workorder::getCreateDate);
+ return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3