From 3e651114469863063847b4fe7f05c538e84eed28 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 15:00:25 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
index a80996b..2435385 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/WorktypeServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WorktypeMapper;
+import com.doumee.dao.business.dto.WorkTypeQueryDTO;
import com.doumee.dao.business.model.Worktype;
import com.doumee.service.business.WorktypeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 宸ョ淇℃伅琛⊿ervice瀹炵幇
@@ -87,10 +89,15 @@
}
@Override
- public List<Worktype> getBySolutionsId(Integer solutionId){
- QueryWrapper<Worktype> wrapper = new QueryWrapper<>();
- wrapper.apply(" id in ( select sw.WORKTYPE_ID from solution_worktype sw where sw.SOLUTION_ID = "+solutionId+" ) ");
- return worktypeMapper.selectList(wrapper);
+ public List<Worktype> findListByDTO(WorkTypeQueryDTO workTypeQueryDTO){
+ List<Worktype> list = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .apply(workTypeQueryDTO.getQueryType().equals(Constants.ZERO),
+ "id in ( select sw.worktype_id from solution_worktype sw where sw.SOLUTION_ID = "+workTypeQueryDTO.getId()+" )")
+ .apply(workTypeQueryDTO.getQueryType().equals(Constants.ONE),
+ "id in ( select dw.work_type_id from du_worktype dw where dw.du_solution_id = "+workTypeQueryDTO.getId()+" )")
+ );
+ return list;
}
@Override
--
Gitblit v1.9.3