From 95db36f778d5a6f4197cc2cde4390c84e57b26b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:36:53 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index aa9a5d8..faa93b4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.SolutionWorktypeJoinMapper;
import com.doumee.dao.business.join.SolutionsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.service.business.CompanyService;
import com.doumee.service.business.SolutionsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -260,7 +261,9 @@
@Override
public List<Solutions> findList(Solutions solutions) {
solutions.setIsdeleted(Constants.ZERO);
- solutions.setDataType(Constants.TWO);
+ if(solutions.getDataType() == null){
+ solutions.setDataType(Constants.TWO);
+ }
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
return solutionsMapper.selectList(wrapper);
}
@@ -406,6 +409,28 @@
return PageData.from(solutionsMapper.selectPage(page, queryWrapper));
}
+
+ @Override
+ public List<Solutions> findListForCompany() {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ List<Solutions> solutionsList = solutionsJoinMapper.selectJoinList(Solutions.class,new MPJLambdaWrapper<Solutions>()
+ .selectAll(Solutions.class)
+ .leftJoin(CompanySolution.class,CompanySolution::getSolutionBaseId,Solutions::getId)
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getDataType,Constants.TWO)
+ .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+ .eq(CompanySolution::getCompanyId,user.getCompanyId())
+ .orderByAsc(Solutions::getSortnum)
+ );
+ return solutionsList;
+ }
+
+
+
+
+
+
+
@Override
public long count(Solutions solutions) {
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
--
Gitblit v1.9.3