server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/dao/system/dto/CompanyUserImportDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/CompanyService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/CompanyUserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,75 @@ package com.doumee.dao.business.model.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @author T14 */ @Data @ApiModel("å ¬å¸åå·¥") public class CompanyUserDTO { @ApiModelProperty(value = "主é®", example = "1") private Integer id; @ApiModelProperty(value = "ç¨æ·å") private String username; @ApiModelProperty(value = "åå·¥åç§°") private String realname; @ApiModelProperty(value = "å·¥å·") private String empNo; @ApiModelProperty(value = "çæ¥") private Date birthday; @ApiModelProperty(value = "æ§å«") private String sex; @ApiModelProperty(value = "é®ç®±") private String email; @ApiModelProperty(value = "ææºå·ç ") private String mobile; @ApiModelProperty(value = "头å") private String avatar; @ApiModelProperty(value = "ä¼ä¸ç¼ç ") private Integer companyId; @ApiModelProperty(value = "ä¼ä¸ç¼ç ") private Integer companyName; @ApiModelProperty(value = "ç±»å 0å¹³å°ç¨æ· 1ä¼ä¸ç¨æ·") private Integer type; @ApiModelProperty(value = "æ¯å¦ä¸ºåºå®ç¨æ·") private Boolean fixed; @ApiModelProperty(value = "å建æ¶é´") private Date createTime; @ApiModelProperty(value = "0 å¯ç¨ 1 ç¦ç¨") private Integer status; @ApiModelProperty(value = "è§è²ID") private Integer roleId; @ApiModelProperty(value = "è§è²ç¼ç ") private String roleCode; @ApiModelProperty(value = "è§è²åç§°") private String roleName; @ApiModelProperty(value = "ç±»å 0å¹³å°ç¨æ· 1ä¼ä¸ç¨æ·") private Integer roleType; } server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,25 @@ package com.doumee.dao.business.model.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author T14 */ @Data @ApiModel("å ¬å¸åå·¥æ¥è¯¢") public class CompanyUserQueryDTO { @ApiModelProperty(value = "ä¼ä¸ç¼ç ") private String companyName; @ApiModelProperty(value = "è¾å ¥ç»å½è´¦å·ç¨æ·åç§°") private String keyWords; @ApiModelProperty(value = "0 å¯ç¨ 1 ç¦ç¨") private Integer status; } server/service/src/main/java/com/doumee/dao/system/dto/CompanyUserImportDTO.java
ÎļþÃû´Ó server/service/src/main/java/com/doumee/dao/system/dto/CompanyUserDTO.java ÐÞ¸Ä @@ -12,7 +12,7 @@ @Data @ApiModel("ä¼ä¸ç¨æ·æ¹éå¯¼å ¥") public class CompanyUserDTO { public class CompanyUserImportDTO { @ExcelColumn(name="ä¼ä¸åç§°") @ApiModelProperty(value = "å ¬å¸åç§°") server/service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -76,6 +76,14 @@ Company findById(Integer id); /** * 䏻鮿¥è¯¢ * * @param id ä¸»é® * @return Company */ Company findPlatformById(Integer id); /** * æ¡ä»¶æ¥è¯¢åæ¡è®°å½ * * @param company å®ä½å¯¹è±¡ server/service/src/main/java/com/doumee/service/business/CompanyUserService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,41 @@ package com.doumee.service.business; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.dto.CompanyUserDTO; import com.doumee.dao.business.model.dto.CompanyUserQueryDTO; import java.util.List; /** * @author T14 */ public interface CompanyUserService { /** * å页æ¥è¯¢ * * @param pageWrap å页对象 * @return PageData<Company> */ PageData<CompanyUserDTO> findPage(PageWrap<CompanyUserQueryDTO> pageWrap); /** * æ¡ä»¶æ¥è¯¢åæ¡è®°å½ * * @param company å®ä½å¯¹è±¡ * @return Company */ CompanyUserDTO findOne(CompanyUserDTO company); /** * æ¡ä»¶æ¥è¯¢ * * @param company å®ä½å¯¹è±¡ * @return List<Company> */ List<CompanyUserDTO> findListByCompanyID(CompanyUserDTO company); } server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -16,6 +16,7 @@ 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.SystemUserMapper; import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.CompanyService; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -23,6 +24,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.Date; @@ -43,6 +45,10 @@ @Autowired private CompanyJoinMapper companyJoinMapper; @Autowired private SystemUserMapper systemUserMapper; @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @Override public Integer create(CompanyCreatOrUpdateRequest company) { LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); @@ -75,6 +81,12 @@ insert.setOepnType(company.getOepnType()); insert.setSalesmanId(company.getSalesmanId()); companyMapper.insert(insert); UpdateWrapper<SystemUser> systemUserQuery = new UpdateWrapper<>(); systemUserQuery.lambda() .eq(SystemUser::getId,company.getManagerId()) .set(SystemUser::getCompanyId,insert.getId()); systemUserMapper.update(null,systemUserQuery); return company.getId(); } @@ -128,6 +140,18 @@ @Override public Company findById(Integer id) { return companyMapper.selectById(id); } @Override public Company findPlatformById(Integer id) { QueryWrapper<Company> wrapper = new QueryWrapper<>(); wrapper.select("company.*," + "(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") .lambda().eq(Company::getId,id); return companyMapper.selectOne(wrapper); } @Override @@ -198,7 +222,7 @@ .like(SystemUser::getUsername,pageWrap.getModel().getManagerUserName()) .eq(Company::getStatus,pageWrap.getModel().getStatus()) .between(Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd()); return PageData.from(companyMapper.selectPage(page, queryWrapper)); return PageData.from(companyJoinMapper.selectJoinPage(page,Company.class,queryWrapper)); } @Override server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,94 @@ package com.doumee.service.business.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.dto.CompanyUserDTO; import com.doumee.dao.business.model.dto.CompanyUserQueryDTO; import com.doumee.dao.system.SystemUserJoinMapper; import com.doumee.dao.system.model.SystemRole; import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.system.model.SystemUserRole; import com.doumee.service.business.CompanyUserService; import com.github.yulichang.base.mapper.MPJJoinMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * @author T14 */ @Service public class CompanyUserServiceImpl implements CompanyUserService { @Autowired private SystemUserJoinMapper systemUserJoinMapper; @Override public PageData<CompanyUserDTO> findPage(PageWrap<CompanyUserQueryDTO> pageWrap) { IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); mpjJoinMapper.selectAll(SystemUser.class) .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId) .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode) .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName) .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType) .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId) .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()) .or() .like(SystemUser::getRealname,pageWrap.getModel().getKeyWords()); IPage<CompanyUserDTO> companyUserDTOIPage = systemUserJoinMapper.selectJoinPage(page, CompanyUserDTO.class, mpjJoinMapper); return PageData.from(companyUserDTOIPage); } @Override public CompanyUserDTO findOne(CompanyUserDTO companyUserDTO) { MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>(); mpjJoinMapper.selectAll(SystemUser.class) .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId) .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode) .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName) .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType) .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId) .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId) .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId) .eq(SystemUser::getType, Constants.ONE) .eq(SystemUser::getId,companyUserDTO.getId()); CompanyUserDTO companyUserDTOIPage = systemUserJoinMapper.selectJoinOne(CompanyUserDTO.class, mpjJoinMapper); return companyUserDTOIPage; } @Override public List<CompanyUserDTO> findListByCompanyID(CompanyUserDTO companyUserDTO) { MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>(); mpjJoinMapper.selectAll(SystemUser.class) .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId) .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode) .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName) .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType) .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId) .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId) .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId) .eq(SystemUser::getType, Constants.ONE) .eq(SystemUser::getId,companyUserDTO.getCompanyId()); List<CompanyUserDTO> companyUserDTOS = systemUserJoinMapper.selectJoinList(CompanyUserDTO.class, mpjJoinMapper); return companyUserDTOS; } }