1、增加企业注册接口

2、增加企业用户查询接口

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/handler/GlobalExceptionHandler.java

@@ -135,6 +135,7 @@ public class GlobalExceptionHandler {
         return commonResult(errorCode.getCode(), errorCode.getMsg());
     }
 
+
     /**
      * 处理 SpringMVC 请求参数缺失
      * <p>
@@ -144,7 +145,7 @@ public class GlobalExceptionHandler {
     public CommonResult<?> missingServletRequestParameterExceptionHandler(MissingServletRequestParameterException ex) {
         log.warn("[missingServletRequestParameterExceptionHandler]", ex);
         // return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数缺失:%s", ex.getParameterName()));
-        return commonResult(BAD_REQUEST.getCode(), ex.getParameterName());
+        return CommonResult.error(BAD_REQUEST.getCode(), String.format("%s", ex.getParameterName()));
     }
 
     /**
@@ -156,7 +157,7 @@ public class GlobalExceptionHandler {
     public CommonResult<?> methodArgumentTypeMismatchExceptionHandler(MethodArgumentTypeMismatchException ex) {
         log.warn("[missingServletRequestParameterExceptionHandler]", ex);
         // return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数类型错误:%s", ex.getMessage()));
-        return commonResult(BAD_REQUEST.getCode(), ex.getMessage());
+        return CommonResult.error(BAD_REQUEST.getCode(), String.format("%s", ex.getMessage()));
     }
 
     /**
@@ -168,7 +169,7 @@ public class GlobalExceptionHandler {
         FieldError fieldError = ex.getBindingResult().getFieldError();
         assert fieldError != null; // 断言，避免告警
         // return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage()));
-        return commonResult(BAD_REQUEST.getCode(), fieldError.getDefaultMessage());
+        return CommonResult.error(BAD_REQUEST.getCode(), String.format("%s", fieldError.getDefaultMessage()));
     }
 
     /**
@@ -180,7 +181,7 @@ public class GlobalExceptionHandler {
         FieldError fieldError = ex.getFieldError();
         assert fieldError != null; // 断言，避免告警
         // return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage()));
-        return commonResult(BAD_REQUEST.getCode(), fieldError.getDefaultMessage());
+        return CommonResult.error(BAD_REQUEST.getCode(), String.format("%s", fieldError.getDefaultMessage()));
     }
 
     /**
@@ -191,7 +192,7 @@ public class GlobalExceptionHandler {
         log.warn("[constraintViolationExceptionHandler]", ex);
         ConstraintViolation<?> constraintViolation = ex.getConstraintViolations().iterator().next();
         // return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", constraintViolation.getMessage()));
-        return commonResult(BAD_REQUEST.getCode(), constraintViolation.getMessage());
+        return CommonResult.error(BAD_REQUEST.getCode(), String.format("%s", constraintViolation.getMessage()));
     }
 
     /**
@@ -215,7 +216,7 @@ public class GlobalExceptionHandler {
     public CommonResult<?> noHandlerFoundExceptionHandler(NoHandlerFoundException ex) {
         log.warn("[noHandlerFoundExceptionHandler]", ex);
         // return CommonResult.error(NOT_FOUND.getCode(), String.format("请求地址不存在:%s", ex.getRequestURL()));
-        return commonResult(NOT_FOUND.getCode(), ex.getRequestURL());
+        return CommonResult.error(NOT_FOUND.getCode(), String.format("%s", ex.getRequestURL()));
     }
 
     /**
@@ -227,7 +228,7 @@ public class GlobalExceptionHandler {
     public CommonResult<?> httpRequestMethodNotSupportedExceptionHandler(HttpRequestMethodNotSupportedException ex) {
         log.warn("[httpRequestMethodNotSupportedExceptionHandler]", ex);
         // return CommonResult.error(METHOD_NOT_ALLOWED.getCode(), String.format("请求方法不正确:%s", ex.getMessage()));
-        return commonResult(METHOD_NOT_ALLOWED.getCode(), ex.getMessage());
+        return CommonResult.error(METHOD_NOT_ALLOWED.getCode(), String.format("%s", ex.getMessage()));
     }
 
     /**

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -168,6 +168,17 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED_NOT_REJECT =
             new ErrorCode(1_200_006_003, "企业注册申请已审批通过,无法拒绝");
 
+    ErrorCode MDE_ENTERPRISE_REGISTER_NAME_NOT_NULL = new ErrorCode(1_200_006_004, "企业名称不能为空");
+    ErrorCode MDE_ENTERPRISE_REGISTER_PHONE_NOT_NULL = new ErrorCode(1_200_006_005, "联系电话不能为空");
+    ErrorCode MDE_ENTERPRISE_REGISTER_EMAIL_NOT_NULL = new ErrorCode(1_200_006_006, "联系邮箱不能为空");
+    ErrorCode MDE_ENTERPRISE_REGISTER_BUSINESS_LICENSE_URL_NOT_NULL =
+            new ErrorCode(1_200_006_007, "未上传营业执照");
+
+    ErrorCode MDE_ENTERPRISE_REGISTER_CREDIT_CODE_NOT_NULL = new ErrorCode(1_200_006_008, "统一社会信用代码不能为空");
+
+    ErrorCode MDE_ENTERPRISE_REGISTER_DUPLICATE = new ErrorCode(1_200_006_009, "企业已注册");
+
+
 
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterPageReqVO.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.admin.enterprise.register;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.citu.framework.common.pojo.PageParam;
@@ -27,6 +28,9 @@ public class EnterpriseRegisterPageReqVO extends PageParam {
     @Schema(description = "联系邮箱")
     private String email;
 
+    @Schema(description = "统一社会信用代码")
+    private String code;
+
     @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", example = "2")
     private String status;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterRespVO.java

@@ -36,6 +36,10 @@ public class EnterpriseRegisterRespVO {
     @ExcelProperty("联系邮箱")
     private String email;
 
+    @Schema(description = "统一社会信用代码")
+    @ExcelProperty("统一社会信用代码")
+    private String code;
+
     @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
     @ExcelProperty("营业执照图片")
     private String businessLicenseUrl;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterSaveReqVO.java

@@ -2,9 +2,9 @@ package com.citu.module.menduner.system.controller.admin.enterprise.register;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotBlank;
 
 @Schema(description = "管理后台 - 门墩儿-企业注册申请新增/修改 Request VO")
 @Data
@@ -25,6 +25,9 @@ public class EnterpriseRegisterSaveReqVO {
     @Schema(description = "联系邮箱")
     private String email;
 
+    @Schema(description = "统一社会信用代码")
+    private String code;
+
     @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
     private String businessLicenseUrl;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseRegisterController.java

@@ -0,0 +1,37 @@
+package com.citu.module.menduner.system.controller.app.enterprise;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseClickReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户端 - 企业注册申请")
+@RestController
+@RequestMapping("/menduner/system/enterprise-register")
+@Validated
+public class AppEnterpriseRegisterController {
+
+    @Resource
+    private EnterpriseRegisterService enterpriseRegisterService;
+
+
+    @PostMapping("/apply")
+    @Operation(summary = "企业注册申请")
+    public CommonResult<Boolean> apply(@RequestBody @Valid AppEnterpriseRegisterReqVO reqVO) {
+        enterpriseRegisterService.apply(reqVO);
+        return success(true);
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseUserBindController.java

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.system.controller.app.enterprise;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import java.util.List;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户端 - 企业用户")
+@RestController
+@RequestMapping("/menduner/system/enterprise-user-bind")
+@Validated
+public class AppEnterpriseUserBindController {
+
+    @Resource
+    private EnterpriseUserBindService enterpriseUserBindService;
+
+
+    @PostMapping("/get/user")
+    @Operation(summary = "获取当前用户绑定的企业列表")
+    public CommonResult<List<AppEnterpriseUserBindRespVO>> getEnterpriseUserBindList() {
+        return success(enterpriseUserBindService.getEnterpriseUserBindList());
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseRegisterReqVO.java

@@ -0,0 +1,33 @@
+package com.citu.module.menduner.system.controller.app.enterprise.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Schema(description = "menduner - 企业申请注册 Request VO")
+@Data
+public class AppEnterpriseRegisterReqVO {
+
+    @NotBlank(message = "{1_200_006_004}")
+    @Schema(description = "企业名称", example = "芋艿")
+    private String name;
+
+    @NotBlank(message = "{1_200_006_005}")
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @NotBlank(message = "{1_200_006_006}")
+    @Schema(description = "联系邮箱")
+    private String email;
+
+    @NotBlank(message = "{1_200_006_006}")
+    @Schema(description = "统一社会信用代码")
+    private String code;
+
+    @NotBlank(message = "{1_200_006_008}")
+    @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
+    private String businessLicenseUrl;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseUserBindRespVO.java

@@ -0,0 +1,37 @@
+package com.citu.module.menduner.system.controller.app.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 企业用户 Response VO")
+@Data
+public class AppEnterpriseUserBindRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23697")
+    private Long id;
+
+    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "616")
+    private Long enterpriseId;
+
+    @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "616")
+    private String enterpriseName;
+
+    @Schema(description = "名称", example = "x女士")
+    private String name;
+
+    @Schema(description = "用户性别")
+    private String sex;
+
+    @Schema(description = "头像地址")
+    private String avatar;
+
+    @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private String status;
+
+    @Schema(description = "最后登录时间")
+    private LocalDateTime loginDate;
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseConvert.java

@@ -2,11 +2,7 @@ package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.*;
-import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedSearchRespVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.*;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -30,5 +26,9 @@ public interface EnterpriseConvert {
 
     AppEnterpriseSimpleRespVO convert5(ESJobAdvertisedMergeDO bean);
 
+    EnterpriseRegisterDO convert6(AppEnterpriseRegisterReqVO bean);
+
+    AppEnterpriseUserBindRespVO convert7(EnterpriseUserBindDO bean);
+
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseRegisterDO.java

@@ -43,6 +43,10 @@ public class EnterpriseRegisterDO extends TenantBaseDO {
      * 联系邮箱
      */
     private String email;
+    /**
+     * 统一社会信用代码
+     */
+    private String code;
     /**
      * 营业执照图片
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseBusinessMapper.java

@@ -37,5 +37,10 @@ public interface EnterpriseBusinessMapper extends BaseMapperX<EnterpriseBusiness
         return selectOne(new LambdaQueryWrapperX<EnterpriseBusinessDO>()
                 .eq(EnterpriseBusinessDO::getEnterpriseId, enterpriseId));
     }
+    default EnterpriseBusinessDO selectByCode(String code) {
+        return selectOne(new LambdaQueryWrapperX<EnterpriseBusinessDO>()
+                .eq(EnterpriseBusinessDO::getCode, code));
+    }
+
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -59,7 +59,6 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectJoinPage(reqVO, AppEnterpriseSimpleRespVO.class, query);
     }
 
-
     default List<EnterpriseDO> selectList(EnterpriseListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<EnterpriseDO>()
                 .likeIfPresent(EnterpriseDO::getName, reqVO.getName())
@@ -73,4 +72,5 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
      List<AppCommonRespVO> searchByName(String name);
 
 
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserBindMapper.java

@@ -6,8 +6,11 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 门墩儿-企业登录用户 Mapper
  *
@@ -26,15 +29,23 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
                 .orderByDesc(EnterpriseUserBindDO::getId));
     }
 
+    default List<EnterpriseUserBindDO> selectListByUserId(Long userId) {
+        return selectList(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
+                .eq(EnterpriseUserBindDO::getUserId, userId)
+                .eq(EnterpriseUserBindDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
+        );
+    }
 
     default EnterpriseUserBindDO selectByUserId(Long userId) {
         return selectOne(EnterpriseUserBindDO::getUserId, userId);
     }
 
-    default EnterpriseUserBindDO selectByEnterpriseIdAndUserId(Long enterpriseId,Long userId) {
+    default EnterpriseUserBindDO selectByEnterpriseIdAndUserId(Long enterpriseId, Long userId) {
         return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eq(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseUserBindDO::getUserId, userId));
+                .eq(EnterpriseUserBindDO::getUserId, userId)
+                .eq(EnterpriseUserBindDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
+        );
     }
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindService.java

@@ -4,9 +4,11 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 门墩儿-企业登录用户 Service 接口
@@ -68,4 +70,8 @@ public interface EnterpriseUserBindService {
      **/
     AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId);
 
+    /**
+     * 获取当前用户绑定的企业列表
+     **/
+    List<AppEnterpriseUserBindRespVO> getEnterpriseUserBindList();
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java

@@ -6,17 +6,23 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_USER_BIND_NOT_EXISTS;
 
 /**
@@ -34,6 +40,9 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     @Resource
     private EnterprisePostService enterprisePostService;
 
+    @Resource
+    private EnterpriseMapper enterpriseMapper;
+
     @Override
     public Long createEnterpriseUserBind(EnterpriseUserBindSaveReqVO createReqVO) {
         // 插入
@@ -82,8 +91,8 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     @Override
-    public AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId) {
-        EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper.selectByEnterpriseIdAndUserId(enterpriseId,userId);
+    public AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId, Long userId) {
+        EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper.selectByEnterpriseIdAndUserId(enterpriseId, userId);
         if (null == userBindDO) {
             throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
         }
@@ -101,4 +110,23 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         resp.setStatus("0");
         return resp;
     }
+
+    @Override
+    public List<AppEnterpriseUserBindRespVO> getEnterpriseUserBindList() {
+        List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
+        if (null == list) {
+            return null;
+        }
+        List<AppEnterpriseUserBindRespVO> respList = new ArrayList<>();
+        for (EnterpriseUserBindDO userBindDO : list) {
+            AppEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
+            EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
+            if (null != enterprise) {
+                resp.setEnterpriseId(enterprise.getId());
+                resp.setEnterpriseName(enterprise.getName());
+            }
+            respList.add(resp);
+        }
+        return respList;
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterService.java

@@ -5,6 +5,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
 
 import javax.validation.Valid;
@@ -67,4 +68,10 @@ public interface EnterpriseRegisterService {
      * @return boolean
      **/
     void reject(EnterpriseRegisterAuditReqVO reqVO);
+
+    /**
+     * 企业注册申请
+     * @param reqVO
+     **/
+    void apply(AppEnterpriseRegisterReqVO reqVO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -7,8 +7,15 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.convert.EnterpriseConvert;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseRegisterMapper;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -16,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -30,6 +38,12 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
     @Resource
     private EnterpriseRegisterMapper enterpriseRegisterMapper;
 
+    @Resource
+    private EnterpriseBusinessMapper enterpriseBusinessMapper;
+
+    @Resource
+    private EnterpriseMapper enterpriseMapper;
+
     @Override
     public Long createEnterpriseRegister(EnterpriseRegisterSaveReqVO createReqVO) {
         // 插入
@@ -84,9 +98,28 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
             // 已审批
             throw exception(MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED);
         }
+        EnterpriseBusinessDO enterpriseBusinessDO = enterpriseBusinessMapper.selectByCode(enterpriseRegister.getCode());
+        if (null != enterpriseBusinessDO) {
+            throw exception(MDE_ENTERPRISE_REGISTER_DUPLICATE);
+        }
+
         enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus());
         enterpriseRegister.setReason(reqVO.getReason());
         enterpriseRegisterMapper.updateById(enterpriseRegister);
+
+        // 增加企业信息
+        EnterpriseDO enterprise = new EnterpriseDO();
+        enterprise.setName(enterpriseRegister.getName());
+        enterprise.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+        enterpriseMapper.insert(enterprise);
+
+
+        EnterpriseBusinessDO business = new EnterpriseBusinessDO();
+        business.setEnterpriseId(enterprise.getId());
+        business.setCode(enterpriseRegister.getCode());
+        business.setName(enterpriseRegister.getName());
+
+        enterpriseBusinessMapper.insert(business);
     }
 
     @Override
@@ -110,4 +143,13 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
         enterpriseRegister.setReason(reqVO.getReason());
         enterpriseRegisterMapper.updateById(enterpriseRegister);
     }
+
+    @Override
+    @DSTransactional
+    public void apply(AppEnterpriseRegisterReqVO reqVO) {
+        EnterpriseRegisterDO register = EnterpriseConvert.INSTANCE.convert6(reqVO);
+        register.setStatus(EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus());
+        register.setUserId(getLoginUserId());
+        enterpriseRegisterMapper.insert(register);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -383,18 +383,8 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
                     AppEnterpriseSimpleRespVO enterprise = EnterpriseConvert.INSTANCE.convert5(searchHit.getContent());
                     enterprise.setId(searchHit.getContent().getEnterpriseId());
-
                     enterprise.setName(searchHit.getContent().getEnterpriseName());
-                    if (null != highlightFields.get("enterpriseName")){
-                        enterprise.setName(highlightFields.get("enterpriseName").get(0));
-                    }
-
                     enterprise.setAnotherName(searchHit.getContent().getEnterpriseAnotherName());
-                    if (null != highlightFields.get("enterpriseAnotherName")){
-                        enterprise.setAnotherName(highlightFields.get("enterpriseAnotherName").get(0));
-                    }
-
-
                     respVO.setEnterprise(enterprise);
 
                     // 获取职位发布人

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/EsQueryBuildUtils.java

@@ -1,13 +1,9 @@
 package com.citu.module.menduner.system.util;
 
 import com.citu.framework.tenant.core.context.TenantContextHolder;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedSearchPageReqVO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
-import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.InnerHitBuilder;
-import org.elasticsearch.index.query.NestedQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.util.StringUtils;
 
@@ -27,7 +23,7 @@ public class EsQueryBuildUtils {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
 
         if (StringUtils.hasText(reqVO.getContent())) {
-            // 企业名称 企业别称
+            // 企业名称 企业别称 职位名称 等
             boolQuery.must(QueryBuilders.multiMatchQuery
                     (
                             reqVO.getContent(),

menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -141,6 +141,12 @@
 1_200_006_001=The enterprise registration application does not exist
 1_200_006_002=Enterprise registration application has been approved
 1_200_006_003=The enterprise registration application has been approved and cannot be rejected
+1_200_006_004=Enterprise name cannot be empty
+1_200_006_005=Contact number cannot be empty
+1_200_006_006=Contact email cannot be empty
+1_200_006_007=Business license not uploaded
+1_200_006_008=Unified social credit code cannot be empty
+1_200_006_009=Enterprise registered
 # ========== 企业地址 1_200_007_001 ==========
 1_200_007_001=The company address does not exist
 # ========== 企业登录用户 1_200_008_000 ==========

menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -142,6 +142,12 @@
 1_200_006_001=企业注册申请不存在
 1_200_006_002=企业注册申请已审批
 1_200_006_003=企业注册申请已审批通过,无法拒绝
+1_200_006_004=企业名称不能为空
+1_200_006_005=联系电话不能为空
+1_200_006_006=联系邮箱不能为空
+1_200_006_007=未上传营业执照
+1_200_006_008=统一社会信用代码不能为空
+1_200_006_009=企业已注册
 # ========== 企业地址 1_200_007_001 ==========
 1_200_007_001=企业地址不存在
 # ========== 企业登录用户 1_200_008_000 ==========