From 3db567c3f22fd2513f6eeac314e509b4abcd6c8b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 30 一月 2024 20:14:13 +0800
Subject: [PATCH] Mr.Shi
---
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index 09930a0..078c04e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -349,6 +349,7 @@
duWorktype.setDuSolutionId(duSolution.getId());
duWorktype.setStatus(Constants.ZERO);
duWorktype.setSortnum(j);
+ duWorktype.setDispatchUnitId(dispatchUnit.getId());
duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId());
duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl());
duWorktype.setStatus2(Constants.ZERO);
@@ -481,6 +482,7 @@
duWorktype.setDuSolutionId(duSolution.getId());
duWorktype.setStatus(Constants.ZERO);
duWorktype.setSortnum(duWorkTypeNum + j);
+ duWorktype.setDispatchUnitId(saveDispatchUnitDTO.getId());
duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId());
duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl());
duWorktype.setStatus2(Constants.ZERO);
@@ -847,19 +849,6 @@
@Override
public List<DispatchUnit> findByDTO(DispatchUnitQueryDTO dispatchUnitQueryDTO) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-// List<DispatchUnit> dispatchUnitList = dispatchUnitMapper.selectList(new QueryWrapper<DispatchUnit>().lambda()
-// .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
-// .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
-// .eq(DispatchUnit::getStatus,Constants.ZERO)
-// .eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
-// .apply(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()), " id in ( select d.dispatch_unit_id from du_solution d where d.solution_id = "+dispatchUnitQueryDTO.getSolutionId()+" ) " )
-// .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
-// " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
-// " ad.du_id = t.id ")
-// .orderByAsc(DispatchUnit::getSortnum)
-// );
-
-
List<DispatchUnit> dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
new MPJLambdaWrapper<DispatchUnit>().selectAll(DispatchUnit.class)
.selectAs(DuSolution::getId,DispatchUnit::getDuSolutionId)
@@ -867,14 +856,13 @@
.eq(DispatchUnit::getIsdeleted,Constants.ZERO)
.eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
.eq(DispatchUnit::getStatus,Constants.ZERO)
- .eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
+ //.eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
+ .eq(DispatchUnit::getDataType,Constants.TWO)
.eq(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),DuSolution::getSolutionId,dispatchUnitQueryDTO.getSolutionId())
.exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
" select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
- " ad.du_id = t.id ")
+ " and ad.du_id = t.id ")
);
-
-
return dispatchUnitList;
}
--
Gitblit v1.9.3