From 04d88ef5d6e9f4814ad16f51f1550bd5be7c6fe6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 九月 2023 09:12:31 +0800
Subject: [PATCH] 优化素材库处理源数据
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
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..7dfd956 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictBiz;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -16,9 +18,15 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
+import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.SystemUserRoleMapper;
+import com.doumee.dao.system.model.SystemDict;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.system.SystemDictService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -47,6 +55,14 @@
@Autowired
private SystemUserMapper systemUserMapper;
+
+
+ @Autowired
+ private SystemUserRoleMapper systemUserRoleMapper;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
@@ -87,6 +103,20 @@
.eq(SystemUser::getId,company.getManagerId())
.set(SystemUser::getCompanyId,insert.getId());
systemUserMapper.update(null,systemUserQuery);
+
+
+ SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE);
+
+ SystemUserRole systemUserRole = new SystemUserRole();
+ systemUserRole.setUserId(company.getManagerId());
+ systemUserRole.setRoleId(Integer.valueOf(dictData.getCode()));
+ systemUserRole.setCreateTime(new Date());
+ systemUserRole.setUpdateTime(new Date());
+ systemUserRole.setCreateUser(userInfo.getId());
+ systemUserRole.setUpdateUser(userInfo.getId());
+ systemUserRole.setDeleted(Boolean.FALSE);
+
+ systemUserRoleMapper.insert(systemUserRole);
return company.getId();
}
@@ -213,15 +243,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));
}
--
Gitblit v1.9.3