Browse Source

小程序新建企业

master
赵鹏 1 month ago
parent
commit
94c0dbc982
  1. 2
      yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
  2. 23
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java
  3. 14
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
  4. 3
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
  5. 7
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseSaveReqVO.java
  6. 5
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/EnterpriseQualificationRespVO.java
  7. 5
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java
  8. 43
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java

2
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java

@ -23,13 +23,11 @@ public class PageParam implements Serializable {
public static final Integer PAGE_SIZE_NONE = -1;
@Schema(description = "页码,从 1 开始", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@NotNull(message = "页码不能为空")
@Min(value = 1, message = "页码最小值为 1")
private Integer pageNo = PAGE_NO;
@Schema(description = "每页条数,最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "每页条数不能为空")
@Min(value = 1, message = "每页条数最小值为 1")
@Max(value = 100, message = "每页条数最大值为 100")
private Integer pageSize = PAGE_SIZE;

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java

@ -1,8 +1,10 @@
package cn.iocoder.yudao.module.system.controller.admin.enterprise;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
import cn.iocoder.yudao.module.system.controller.admin.qualification.vo.EnterpriseQualificationRespVO;
import cn.iocoder.yudao.module.system.controller.admin.taglibrary.vo.TagLibraryPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.taglibrary.vo.TagLibraryRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@ -21,6 +23,7 @@ import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl;
import cn.iocoder.yudao.module.system.service.enterprisetag.EnterpriseTagService;
import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
import cn.iocoder.yudao.module.system.service.qualification.EnterpriseQualificationService;
import cn.iocoder.yudao.module.system.service.qualification.EnterpriseQualificationServiceImpl;
import cn.iocoder.yudao.module.system.service.taglibrary.TagLibraryService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -140,9 +143,6 @@ public class EnterpriseController {
enterprise.setFiles(list);
}
//获取标签
// final List<TagLibraryDO> tagLibraryDOS = tagLibraryService.listByEnterpriseId(enterprise.getId());
// enterprise.setTagList(tagLibraryDOS.stream().map(item->item.getTagName()).collect(Collectors.toList()));
// 获取标签
List<TagLibraryDO> tagLibraryDOS = tagLibraryService.listByEnterpriseId(enterprise.getId());
@ -167,7 +167,7 @@ public class EnterpriseController {
//获取资质
LambdaQueryWrapper<EnterpriseQualificationDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EnterpriseQualificationDO::getEnterpriseId, enterprise.getId());
final List<EnterpriseQualificationDO> enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper);
List<EnterpriseQualificationDO> enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper);
if (enterpriseQualificationList != null && enterpriseQualificationList.size() > 0) {
enterpriseQualificationList.forEach(item->{
@ -182,18 +182,24 @@ public class EnterpriseController {
}
});
}
List<EnterpriseQualificationRespVO> bean1 = BeanUtils.toBean(enterpriseQualificationList, EnterpriseQualificationRespVO.class);
Map<Long, List<EnterpriseQualificationRespVO>> longListMap = CollectionUtils.convertMultiMap(bean1, EnterpriseQualificationRespVO::getId);
List<String> collectQuali = longListMap.keySet().stream().map(x -> x.toString()).collect(Collectors.toList());
Map<String, List<InfraFileInfoDTO>> fileListMap = fileInfoService.getFileListMap(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, EnterpriseQualificationServiceImpl.DEFAULT_DICT_DATA_QYZZ, collectQuali);
enterprise.setQualificationList(enterpriseQualificationList);
}
for (EnterpriseQualificationRespVO item : bean1) {
item.setFiles(fileListMap.get(item.getId().toString()));
}
enterprise.setQualificationList(bean1);
}
}
return success(enterprise);
}
@GetMapping("/pcpage")
@Operation(summary = "电脑端获得企业标签分页")
@PreAuthorize("@ss.hasPermission('system:tag-library:query')")
public CommonResult<PageResult<EnterpriseRespVO>> getTagLibraryPcPage(EnterprisePageReqVO pageReqVO) {
PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageReqVO);
pageResult.getList().forEach(item->{
@ -208,7 +214,6 @@ public class EnterpriseController {
@GetMapping("/page")
@Operation(summary = "获得企业分页")
@PreAuthorize("@ss.hasPermission('system:enterprise:query')")
public CommonResult<PageResult<EnterpriseRespVO>> getEnterprisePage(EnterprisePageReqVO pageReqVO) {
PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageReqVO);
pageResult.getList().forEach(item->{

14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java

@ -78,8 +78,6 @@ public class EnterprisePageReqVO extends PageParam {
@Schema(description = "修改人")
private String updater;
// @Schema(description = "管理部门", example = "26433")
// private Long deptId;
@Schema(description = "邀请人")
private String inviterName;
@ -90,5 +88,17 @@ public class EnterprisePageReqVO extends PageParam {
@Schema(description = "根据标签类型过滤")
private List<Long> tagList;
@Schema(description = "根据标签类型过滤")
private String onlyEnterprisesName;
@Schema(description = "企业人员")
private Long enterpriseUserId;
@Schema(description = "企业ids")
private List<Long> enterpriseIds;
@Schema(description = "排除企业id")
private Long excludeEnterpriseId;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.controller.admin.enterprise.vo;
import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
import cn.iocoder.yudao.module.system.controller.admin.qualification.vo.EnterpriseQualificationRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.qualification.EnterpriseQualificationDO;
import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
import io.swagger.v3.oas.annotations.media.Schema;
@ -105,7 +106,7 @@ public class EnterpriseRespVO {
private List<InfraFileInfoDTO> files;
@Schema(description = "企业资质列表", example = "26433")
private List<EnterpriseQualificationDO> qualificationList;
private List<EnterpriseQualificationRespVO> qualificationList;
@Schema(description = "企业标签", example = "26433")
private List<String> tagList;

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseSaveReqVO.java

@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.system.controller.admin.enterprise.vo;
import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.qualification.vo.EnterpriseQualificationSaveReqVO;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@ -81,5 +83,10 @@ public class EnterpriseSaveReqVO {
@Schema(description = "审核信息", example = "26433")
private String content;
@Schema(description = "标签id")
private List<Long> tagIds;
@Schema(description = "企业资质")
private List<EnterpriseQualificationSaveReqVO> qualis;
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/EnterpriseQualificationRespVO.java

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.controller.admin.qualification.vo;
import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@ -62,4 +63,8 @@ public class EnterpriseQualificationRespVO {
@Schema(description = "企业图片", example = "26433")
private List<InfraFileInfoDTO> files;
//资质状态
@TableField(exist = false)
private Integer status;
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java

@ -38,6 +38,11 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
.eqIfPresent(EnterpriseDO::getGpsLocation, reqVO.getGpsLocation())
.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(EnterpriseDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(EnterpriseDO::getEnterprisesName,reqVO.getOnlyEnterprisesName())
.inIfPresent(EnterpriseDO::getId,reqVO.getEnterpriseIds())
//不能于id
.neIfPresent(EnterpriseDO::getId,reqVO.getExcludeEnterpriseId())
// .or(w->w.eq( EnterpriseDO::getCreator, getLoginUserId()))
.orderByDesc(EnterpriseDO::getId));
}

43
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.system.service.enterprise;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.RoleNameAndSelectTypeVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
@ -17,10 +20,12 @@ import cn.iocoder.yudao.module.system.dal.mysql.enterprisetag.EnterpriseTagMappe
import cn.iocoder.yudao.module.system.dal.mysql.fileInfo.FileInfoMapper;
import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMapper;
import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
import cn.iocoder.yudao.module.system.dal.mysql.qualification.EnterpriseQualificationMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.service.auth.AdminAuthService;
import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.qualification.EnterpriseQualificationService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -61,6 +66,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
private EnterpriseMapper enterpriseMapper;
@Resource
private FileInfoMapper fileInfoMapper;
@Resource
private EnterpriseQualificationService enterpriseQualificationService;
@Resource
private EnterpriseAuditLogMapper enterpriseAuditLogMapper;
@Resource
@ -87,8 +95,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
//先查询是否存在
LambdaQueryWrapper<EnterpriseDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EnterpriseDO::getEnterprisesName, createReqVO.getEnterprisesName());
final EnterpriseDO enterpriseDO = enterpriseMapper.selectOne(queryWrapper);
if (enterpriseDO != null) {
if (enterpriseMapper.exists(queryWrapper)) {
throw exception(ENTERPRISE_EXISTS);
}
@ -137,6 +144,27 @@ public class EnterpriseServiceImpl implements EnterpriseService {
}
}
if(!CollectionUtils.isAnyEmpty(createReqVO.getTagIds())){
List<EnterpriseTagDO> enterpriseTagDOList = new ArrayList<>();
for (Long tagId : createReqVO.getTagIds()) {
EnterpriseTagDO enterpriseTagDO = new EnterpriseTagDO();
enterpriseTagDO.setEnterpriseId(enterprise.getId());
enterpriseTagDO.setTagId(tagId);
enterpriseTagDOList.add(enterpriseTagDO);
}
enterpriseTagMapper.insertBatch(enterpriseTagDOList);
}
if(!CollectionUtils.isAnyEmpty(createReqVO.getQualis()))
{
//企业资质
createReqVO.getQualis().forEach(enterpriseQualificationSaveReqVO -> {
enterpriseQualificationSaveReqVO.setEnterpriseId(enterprise.getId());
enterpriseQualificationService.createEnterpriseQualification(enterpriseQualificationSaveReqVO);
});
}
// 返回
return enterprise.getId();
}
@ -218,6 +246,17 @@ public class EnterpriseServiceImpl implements EnterpriseService {
@Override
public PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO) {
if(pageReqVO.getEnterpriseUserId()!=null){
LambdaQueryWrapperX<EnterprisesUserDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<EnterprisesUserDO>();
lambdaQueryWrapperX.eqIfPresent(EnterprisesUserDO::getUserId, pageReqVO.getUserId());
List<EnterprisesUserDO> enterprisesUserDOS = enterprisesUserMapper.selectList(lambdaQueryWrapperX);
if(!CollectionUtils.isAnyEmpty(enterprisesUserDOS)){
pageReqVO.setEnterpriseIds(CollectionUtils.convertList(enterprisesUserDOS,EnterprisesUserDO::getEnterprisesId));
}
}
final PageResult<EnterpriseDO> enterpriseDOPageResult = enterpriseMapper.selectPage(pageReqVO);
return enterpriseDOPageResult;
}

Loading…
Cancel
Save