From 104a870973750c0ab63af9e20063604b243f8f15 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 13 九月 2023 10:54:06 +0800
Subject: [PATCH] #自测修改
---
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 2 +-
server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java | 8 ++++----
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 19 ++++++++++---------
server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java | 13 +++++++++----
5 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index 71e0ce1..e729cef 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -84,7 +84,7 @@
*/
@ApiOperation("骞冲彴鏌ヨ浼佷笟淇℃伅-鍒嗛〉鏌ヨ")
@PostMapping("/findPlatformPage")
- @RequiresPermissions("company:company:query")
+// @RequiresPermissions("company:company:query")
public ApiResponse<PageData<Company>> findPlatformPage(@RequestBody PageWrap<Company> pageWrap){
return ApiResponse.success(companyService.findPlatformPage(pageWrap));
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
index b22544f..0ab78d3 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
@@ -36,8 +36,8 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("company:company:query")
- public ApiResponse<PageData<CompanyUserDTO>> findPage(PageWrap<CompanyUserQueryDTO> pageWrap){
+// @RequiresPermissions("company:company:query")
+ public ApiResponse<PageData<CompanyUserDTO>> findPage(@RequestBody PageWrap<CompanyUserQueryDTO> pageWrap){
return ApiResponse.success(companyUserService.findPage(pageWrap));
}
@@ -50,7 +50,7 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/findByUserId")
- @RequiresPermissions("company:company:query")
+// @RequiresPermissions("company:company:query")
public ApiResponse<CompanyUserDTO> findByUserId(@RequestParam("userId") Integer userId){
CompanyUserDTO company = new CompanyUserDTO();
@@ -66,7 +66,7 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ")
@GetMapping("/findListByCompanyID")
- @RequiresPermissions("company:company:query")
+// @RequiresPermissions("company:company:query")
public ApiResponse<List<CompanyUserDTO>> findListByCompanyID(@RequestParam("companyId") Integer companyId){
CompanyUserDTO company = new CompanyUserDTO();
company.setCompanyId(companyId);
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java
index f2aade2..42b38bf 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java
@@ -45,8 +45,8 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
private Integer companyId;
- @ApiModelProperty(value = "浼佷笟缂栫爜")
- private Integer companyName;
+ @ApiModelProperty(value = "浼佷笟m鍚嶇О")
+ private String companyName;
@ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛")
private Integer type;
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 9d9bad5..b8e28e8 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
@@ -213,15 +213,16 @@
queryWrapper.selectAll(Company.class)
.selectAs(SystemUser::getUsername,Company::getManagerUserName);
queryWrapper.select(
- "(select su1.USERNAME from system_user su1 where su1.id = company.MANAGER_ID) as managerUserName," +
- "(select su2.REALNAME from system_user su2 where su2.id = company.SALESMAN_ID) as salesmanRealName," +
- "(select count(su3.id) from system_user su3 where su3.COMPANY_ID = company.ID and su3.TYPE = 2) as anchorUserNum," +
- "(select count(su4.id) from system_user su4 where su4.COMPANY_ID = company.ID and su3.TYPE = 1) as empUserNum," +
- "(select count(goods.id) from goods where g.COMPANY_ID = company.ID )goodsNum");
- queryWrapper.eq(Company::getName,pageWrap.getModel().getName())
- .like(SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
- .eq(Company::getStatus,pageWrap.getModel().getStatus())
- .between(Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
+ "(select su1.USERNAME from system_user su1 where su1.id = t.MANAGER_ID) as managerUserName," +
+ "(select su2.REALNAME from system_user su2 where su2.id = t.SALESMAN_ID) as salesmanRealName," +
+ "(select count(su3.id) from system_user su3 where su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
+ "(select count(su4.id) from system_user su4 where su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
+ "(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
+ .eq(Objects.nonNull(pageWrap.getModel().getManagerUserName()),Company::getStatus,pageWrap.getModel().getStatus())
+ .between((Objects.nonNull(pageWrap.getModel().getOepnValidDateStart()) && Objects.nonNull(pageWrap.getModel().getOepnValidDateEnd())),
+ Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper));
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
index fb23b03..99e4c0a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
@@ -16,10 +16,12 @@
import com.doumee.service.business.CompanyUserService;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* @author T14
@@ -38,6 +40,7 @@
MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
mpjJoinMapper.selectAll(SystemUser.class)
+ .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
.selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
.selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
.selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
@@ -46,11 +49,11 @@
.leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(SystemUser::getType, Constants.ONE)
- .eq(SystemUser::getStatus,pageWrap.getModel().getStatus())
- .like(Company::getName,pageWrap.getModel().getCompanyName())
- .like(SystemUser::getUsername,pageWrap.getModel().getKeyWords())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),SystemUser::getStatus,pageWrap.getModel().getStatus())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),SystemUser::getUsername,pageWrap.getModel().getKeyWords())
.or()
- .like(SystemUser::getRealname,pageWrap.getModel().getKeyWords());
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),SystemUser::getRealname,pageWrap.getModel().getKeyWords());
IPage<CompanyUserDTO> companyUserDTOIPage = systemUserJoinMapper.selectJoinPage(page, CompanyUserDTO.class, mpjJoinMapper);
return PageData.from(companyUserDTOIPage);
@@ -60,6 +63,7 @@
public CompanyUserDTO findOne(CompanyUserDTO companyUserDTO) {
MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
mpjJoinMapper.selectAll(SystemUser.class)
+ .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
.selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
.selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
.selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
@@ -78,6 +82,7 @@
public List<CompanyUserDTO> findListByCompanyID(CompanyUserDTO companyUserDTO) {
MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
mpjJoinMapper.selectAll(SystemUser.class)
+ .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
.selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
.selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
.selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
--
Gitblit v1.9.3