From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 0715696..688db64 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.SolutionsMapper;
import com.doumee.dao.business.WorktypeMapper;
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.SolutionsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,6 +30,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
/**
@@ -41,6 +43,8 @@
@Autowired
private SolutionsMapper solutionsMapper;
+ @Autowired
+ private SolutionsJoinMapper solutionsJoinMapper;
@Autowired
private WorktypeMapper worktypeMapper;
@Autowired
@@ -359,10 +363,41 @@
}
return PageData.from(solutionsMapper.selectPage(page, queryWrapper));
}
+ @Override
+ public PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap) {
+ IPage<Solutions> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Solutions> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDataType(Constants.ZERO);//鍙�夋嫨鍩鸿〃鏁版嵁
+ pageWrap.getModel().setStatus(Constants.ZERO);
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ queryWrapper.exists(("select b.id from company_solution b where b.isdeleted=0 and b.company_id="+user.getCompanyId()+" and b.SOLUTION_BASE_ID = solutions.id"));
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().like(Solutions::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(Solutions::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getSortnum() != null) {
+ queryWrapper.lambda().eq(Solutions::getSortnum, pageWrap.getModel().getSortnum());
+ }
+ if (pageWrap.getModel().getInsuranceId() != null) {
+ queryWrapper.lambda().eq(Solutions::getInsuranceId, pageWrap.getModel().getInsuranceId());
+ }
+ if (pageWrap.getModel().getBaseId() != null) {
+ queryWrapper.lambda().eq(Solutions::getBaseId, pageWrap.getModel().getBaseId());
+ }
+ queryWrapper.lambda().orderByAsc(Solutions::getInsuranceId);
+ return PageData.from(solutionsMapper.selectPage(page, queryWrapper));
+ }
@Override
public long count(Solutions solutions) {
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
return solutionsMapper.selectCount(wrapper);
}
+
+
+
}
--
Gitblit v1.9.3