From d4920f7a0b3146a2218a210d3f93b655ff010eb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 17:14:13 +0800
Subject: [PATCH] 开发业务接口

---
 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 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 d46df3d..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;
@@ -185,6 +186,7 @@
         );
         solutionsMapper.update(null,new UpdateWrapper<Solutions>()
                 .lambda()
+                .ne(Solutions::getId,newModel.getId())
                 .eq(Solutions::getBaseId,solutions.getId())
                 .eq(Solutions::getDataType,Constants.TWO)
                 .set(Solutions::getDataType,Constants.ONE)
@@ -259,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);
     }
@@ -373,6 +377,7 @@
             }
         }
         PageData<Solutions> pageData = PageData.from(solutionsJoinMapper.selectJoinPage(page,Solutions.class, queryWrapper));
+
         return pageData;
     }
     @Override
@@ -404,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