From 27c664db968d39f1381a5fe27a6f6cae3887b2e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 11:27:52 +0800
Subject: [PATCH] 调整
---
server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 3 ++-
server/service/src/main/java/com/doumee/service/business/SolutionsService.java | 1 +
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 28 ++++++++++++++++++++++++++++
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
index 224ba1e..48a4c27 100644
--- a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
@@ -67,12 +67,13 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("銆愬钩鍙扮銆戝垎椤垫煡璇�")
@PostMapping("/page")
@RequiresPermissions("business:solutions:query")
public ApiResponse<PageData<Solutions>> findPage (@RequestBody PageWrap<Solutions> pageWrap) {
return ApiResponse.success(solutionsService.findPage(pageWrap));
}
+
@ApiOperation("鍒楄〃鏌ヨ")
@PostMapping("/list")
@RequiresPermissions("business:solutions:query")
diff --git a/server/service/src/main/java/com/doumee/service/business/SolutionsService.java b/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
index 5f706b5..fde2b3e 100644
--- a/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
@@ -87,6 +87,7 @@
* @return PageData<Solutions>
*/
PageData<Solutions> findPage(PageWrap<Solutions> pageWrap);
+ PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap);
/**
* 鏉′欢缁熻
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 15ba46b..254ceb2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -448,7 +448,7 @@
if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
+ /*MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
csWrapper.selectAll(CompanySolution.class);
csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
@@ -456,7 +456,7 @@
csWrapper.eq(CompanySolution::getIsdeleted,Constants.ZERO);
csWrapper.orderByAsc(CompanySolution::getSortnum);
model.setSolutionList(companySolutionJoinMapper.selectJoinList(CompanySolution.class,csWrapper));
-
+*/
initImgData(model);
return model;
}
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..e8a4fdb 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
@@ -359,6 +359,34 @@
}
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) {
--
Gitblit v1.9.3