Sfoglia il codice sorgente

调整火苗儿 新增访问menduner-system 相关的访问代理

DESKTOP-VAEGFGM\zqc 8 mesi fa
parent
commit
57ad7fce2d
50 ha cambiato i file con 1139 aggiunte e 1722 eliminazioni
  1. 1 0
      menduner/menduner-flames-api/src/main/java/com/citupro/module/menduner/flames/enums/ErrorCodeConstants.java
  2. 6 0
      menduner/menduner-flames-biz/pom.xml
  3. 34 56
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/FeignClientsConfigurationCustom.java
  4. 41 124
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/RestTmplateConfig.java
  5. 24 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/TenantIdInterceptor.java
  6. 0 33
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/ClientController.java
  7. 0 214
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseController.java
  8. 7 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitListReqVo.java
  9. 320 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseVo.java
  10. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitInfoVo.java
  11. 126 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseConvert.java
  12. 47 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseRecruitConvert.java
  13. 24 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseRecruitTagConvertVo.java
  14. 2 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/Enterprise.java
  15. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/EnterpriseQualifications.java
  16. 12 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/EnterpriseRecruit.java
  17. 4 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/framework/rpc/config/RpcConfiguration.java
  18. 11 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/PraciceSubmitRecordMapper.java
  19. 0 8
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/ClientService.java
  20. 0 34
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/EnterpriseRecruitService.java
  21. 4 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/PraciceSubmitRecordService.java
  22. 9 32
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/proxy/EnterpriseProxyService.java
  23. 25 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/proxy/EnterpriseRecruitProxyService.java
  24. 0 81
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/ClientServiceImpl.java
  25. 3 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/CommentServiceImpl.java
  26. 4 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseRecruitPlanServiceImpl.java
  27. 0 226
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseRecruitServiceImpl.java
  28. 0 246
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseServiceImpl.java
  29. 31 13
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/PraciceSubmitRecordServiceImpl.java
  30. 3 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnerpriseContractServiceImpl.java
  31. 3 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseChoiceActivityJoinServiceImpl.java
  32. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseChoiceActivityServiceImpl.java
  33. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseVisitorServiceImpl.java
  34. 6 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentInternshipCertificateServiceImpl.java
  35. 6 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentInternshipReportServiceImpl.java
  36. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentRecommendationServiceImpl.java
  37. 6 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentServiceImpl.java
  38. 17 23
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/UserAuthRecordServiceImpl.java
  39. 166 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/proxy/EnterpriseProxyServiceImpl.java
  40. 117 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/proxy/EnterpriseRecruitProxyServiceImpl.java
  41. 5 5
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/EnterpriseServiceApi.java
  42. 2 1
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/EnterpriseRecruitServiceApi.java
  43. 31 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/respvo/AppFlameJobRespVO.java
  44. 23 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/respvo/AppFlamesJobRespVo.java
  45. 0 23
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppEnterpriseJobRespVO.java
  46. 0 197
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseBusinessRespVO.java
  47. 5 3
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseDetailRespVO.java
  48. 0 360
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseRespVO.java
  49. 1 1
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseRespVo.java
  50. 2 1
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/job/fair/JobFairServiceApi.java

+ 1 - 0
menduner/menduner-flames-api/src/main/java/com/citupro/module/menduner/flames/enums/ErrorCodeConstants.java

@@ -20,6 +20,7 @@ public interface ErrorCodeConstants {
 
 
     ErrorCode SYSTEM_ERROR = new ErrorCode(1_130_000_000, "系统异常");
+    ErrorCode API_NOT_EXISTS_ERROR = new ErrorCode(1_130_000_001, "api接口不存在,或失效。");
 
     // 企业
     ErrorCode EXISTS_ENTERPRISE = new ErrorCode(1_130_001_001, "企业已存在");

+ 6 - 0
menduner/menduner-flames-biz/pom.xml

@@ -97,6 +97,12 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>menduner-system-api</artifactId>
+            <version>2.2.0-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

+ 34 - 56
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/FeignClientsConfigurationCustom.java

@@ -1,56 +1,34 @@
-//package com.citupro.flames.config;
-//
-//
-//import feign.Request;
-//import feign.RequestInterceptor;
-//import feign.RequestTemplate;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.context.request.RequestAttributes;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.Enumeration;
-//
-//@Configuration
-//public class FeignClientsConfigurationCustom implements RequestInterceptor {
-//
-//
-//    @Value("${ribbon.connectTimeout:6000}")
-//    private  Integer connectTimeout;
-//
-//    @Value("${ribbon.readTimeout:18000000}")
-//    private  Integer readTimeout;
-//
-//    @Bean
-//    public Request.Options feignRequestOptions() {
-//        return new Request.Options(connectTimeout,readTimeout,true);
-//    }
-//
-//
-//    @Override
-//    public void apply(RequestTemplate requestTemplate) {
-//        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-//        if (requestAttributes == null) {
-//            return;
-//        }
-//
-//        HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
-//        Enumeration<String> headerNames = request.getHeaderNames();
-//        if (headerNames != null) {
-//            while (headerNames.hasMoreElements()) {
-//                String name = headerNames.nextElement();
-//                Enumeration<String> values = request.getHeaders(name);
-//                while (values.hasMoreElements()) {
-//                    String value = values.nextElement();
-//                    if(!"content-type".equals(name)){
-//                        requestTemplate.header(name, value);
-//                    }
-//                }
-//            }
-//        }
-//
-//    }
-//}
+package com.citupro.module.menduner.flames.config;
+
+
+import feign.Request;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+@Configuration
+public class FeignClientsConfigurationCustom implements RequestInterceptor {
+
+
+
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (requestAttributes == null) {
+            return;
+        }
+
+        HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
+        requestTemplate.header("tenant-id", "155");
+
+    }
+}

+ 41 - 124
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/RestTmplateConfig.java

@@ -1,124 +1,41 @@
-//package com.citupro.flames.config;
-//
-////import com.alibaba.fastjson.serializer.JavaBeanSerializer;
-//
-//import com.alibaba.fastjson.serializer.*;
-//import com.alibaba.fastjson.support.config.FastJsonConfig;
-//import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-//import com.bing.digitalparadigm.model.Result;
-//import com.citupro.flames.component.HeaderRequestInterceptor;
-//import com.citupro.flames.filter.DictFastJsonFilter;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-//import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.http.MediaType;
-//import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-//import org.springframework.http.converter.HttpMessageConverter;
-//import org.springframework.http.converter.StringHttpMessageConverter;
-//import org.springframework.web.client.RestTemplate;
-//
-//import java.nio.charset.Charset;
-//import java.util.ArrayList;
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.Map;
-//
-//@Configuration
-//public class RestTmplateConfig {
-//
-//    @Autowired
-//    HeaderRequestInterceptor headerRequestInterceptor;
-//
-//
-//    @Bean
-//    @LoadBalanced
-//    public RestTemplate getRestTemplate(FastJsonHttpMessageConverter fastConverter){    //设置转发的编码格式UTF-8
-//        HttpComponentsClientHttpRequestFactory httpComponentsClientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
-//        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(15000);
-//        httpComponentsClientHttpRequestFactory.setConnectTimeout(15000);
-//        httpComponentsClientHttpRequestFactory.setReadTimeout(15000);
-//        RestTemplate restTemplate = new RestTemplate();
-//        restTemplate.setInterceptors( Arrays.asList(headerRequestInterceptor) );
-//
-//        List<HttpMessageConverter<?>> httpMessageConverters = restTemplate.getMessageConverters();
-//        httpMessageConverters.stream().forEach(httpMessageConverter -> {
-//            if(httpMessageConverter instanceof StringHttpMessageConverter){
-//                StringHttpMessageConverter messageConverter = (StringHttpMessageConverter) httpMessageConverter;
-//                messageConverter.setDefaultCharset(Charset.forName("UTF-8"));
-//            }
-//        });
-//        httpMessageConverters.add(fastConverter);
-//        return  restTemplate;
-//    }
-//
-//    @Bean
-//    public FastJsonHttpMessageConverter initFastJsonHttpMessageConverter(DictFastJsonFilter dictFastJsonFilter) {
-//        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-//        FastJsonConfig fastJsonConfig = new FastJsonConfig();
-//        fastJsonConfig.getParserConfig().setSafeMode(true);
-//        List<MediaType> supportedMediaTypes = new ArrayList<>();
-//        supportedMediaTypes.add(MediaType.APPLICATION_JSON);
-////        supportedMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
-//        supportedMediaTypes.add(MediaType.APPLICATION_ATOM_XML);
-//        supportedMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
-//        supportedMediaTypes.add(MediaType.APPLICATION_OCTET_STREAM);
-//        supportedMediaTypes.add(MediaType.APPLICATION_PDF);
-//        supportedMediaTypes.add(MediaType.APPLICATION_RSS_XML);
-//        supportedMediaTypes.add(MediaType.APPLICATION_XHTML_XML);
-//        supportedMediaTypes.add(MediaType.APPLICATION_XML);
-//        supportedMediaTypes.add(MediaType.IMAGE_GIF);
-//        supportedMediaTypes.add(MediaType.IMAGE_JPEG);
-//        supportedMediaTypes.add(MediaType.IMAGE_PNG);
-//        supportedMediaTypes.add(MediaType.TEXT_EVENT_STREAM);
-//        supportedMediaTypes.add(MediaType.TEXT_HTML);
-//        supportedMediaTypes.add(MediaType.TEXT_MARKDOWN);
-//        supportedMediaTypes.add(MediaType.TEXT_PLAIN);
-//        supportedMediaTypes.add(MediaType.TEXT_XML);
-//        fastConverter.setSupportedMediaTypes(supportedMediaTypes);
-//        fastJsonConfig.setSerializerFeatures(
-//                SerializerFeature.DisableCircularReferenceDetect,
-//                /*是否输出值为null的字段,默认为false,我们将它打开*/
-//                SerializerFeature.WriteMapNullValue,
-//                /*将Collection类型字段的字段空值输出为[]*/
-//                SerializerFeature.WriteNullListAsEmpty,
-//                /*将字符串类型字段的空值输出为空字符串*/
-//                SerializerFeature.WriteNullStringAsEmpty,
-//                /*将数值类型字段的空值输出为0*/
-//                SerializerFeature.WriteNullNumberAsZero,
-//                /*自定义日期格式*/
-//                SerializerFeature.WriteDateUseDateFormat,
-//                SerializerFeature.PrettyFormat,
-//                SerializerFeature.DisableCircularReferenceDetect,
-//                SerializerFeature.WriteNullListAsEmpty
-//        );
-//        fastConverter.setFastJsonConfig(fastJsonConfig);
-//        // fastjson的值过滤器ValueFilter 可以对序列化的值做统一处理,此处我将为null的空值全部统一处理为空字符串
-//        ValueFilter valueFilter = (o, s, o1) -> {
-//            if (null == o1) {
-//                o1 = "";
-//            }
-//            return o1;
-//        };
-//        fastJsonConfig.setSerializeFilters(valueFilter);
-//        SerializeConfig config = new SerializeConfig();
-////        config.
-//        config.put(Result.class,  new JavaBeanSerializer(Result.class));
-//        config.put(Map.class,  new JavaBeanSerializer(Map.class));
-//        config.put(Long.class,  new ToStringSerializer());
-//        fastJsonConfig.setSerializeConfig(config);
-//        fastJsonConfig.setSerializeFilters(dictFastJsonFilter);
-//        fastConverter.setFastJsonConfig(fastJsonConfig);
-//        return fastConverter;
-//    }
-//
-//
-//
-//    @Bean
-//    public HttpMessageConverters fastJsonHttpMessageConverters(FastJsonHttpMessageConverter fastConverter) {
-//        return new HttpMessageConverters(fastConverter);
-//    }
-//
-//
-//}
+package com.citupro.module.menduner.flames.config;
+
+//import com.alibaba.fastjson.serializer.JavaBeanSerializer;
+
+import com.alibaba.fastjson.serializer.*;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Configuration
+public class RestTmplateConfig {
+
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder,TenantIdInterceptor feignClientsConfigurationCustom) {
+        RestTemplate restTemplate = restTemplateBuilder.additionalInterceptors(feignClientsConfigurationCustom).build();
+        return restTemplate;
+    }
+
+
+
+
+
+}

+ 24 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/config/TenantIdInterceptor.java

@@ -0,0 +1,24 @@
+package com.citupro.module.menduner.flames.config;
+
+import cn.hutool.core.collection.CollUtil;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Iterator;
+
+@Component
+public class TenantIdInterceptor implements ClientHttpRequestInterceptor {
+    @Override
+    public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
+        request.getHeaders().add("tenant-id","155");
+        return clientHttpRequestExecution.execute(request, body);
+    }
+}

+ 0 - 33
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/ClientController.java

@@ -1,33 +0,0 @@
-package com.citupro.module.menduner.flames.controller.app;
-
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citupro.module.menduner.flames.service.ClientService;
-import org.springframework.beans.factory.annotation.Autowired;
-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 java.io.UnsupportedEncodingException;
-import java.util.Map;
-@RequestMapping("/flames")
-@RestController
-public class ClientController   {
-
-    ClientService clientService;
-
-
-    @PostMapping("/client/get")
-    public CommonResult getClient(@RequestBody Map reqVo) throws UnsupportedEncodingException {
-        String clientType = reqVo.getOrDefault("clientType", "0").toString();
-        return clientService.getClient(SecurityFrameworkUtils.getLoginUserId(),Integer.valueOf(clientType));
-    }
-
-
-    @Autowired
-    public void setClientService(ClientService clientService) {
-        this.clientService = clientService;
-    }
-}

+ 0 - 214
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseController.java

@@ -1,214 +0,0 @@
-package com.citupro.module.menduner.flames.controller.app;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseSchoolPracticeListReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipEnterpriseDeptListVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.EnterpriseIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseSchoolPracticeListVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipEnterpriseDeptVo;
-import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-
-/**
- * @author code generator
- * @date 2023-06-06 09:56:21
- * @eo.api-type http
- * @eo.groupName 火苗儿.企业管理.企业基础信息管理
- * @eo.path
- */
-@RequestMapping("/flames")
-@RestController
-public class EnterpriseController  {
-    @SuppressWarnings("all")
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(EnterpriseController.class);
-    @Autowired
-    private EnterpriseService enterpriseService;
-
-    /**
-     * @param enterpriseId 企业Id
-     * @return
-     * @eo.name 企业评论词云查询
-     * @eo.url /enterprise/work/cloud
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/work/cloud")
-    public CommonResult enterpriseWorkColud(@RequestBody SchoolIdReqVo schoolIdReqVo) {
-        return enterpriseService.enterpriseWorkColud(schoolIdReqVo.getSchoolId());
-    }
-
-    /**
-     * @param studentInternshipEnterpriseDeptListVo
-     * @return
-     * @eo.name 实习学生查询
-     * @eo.url /enterprise/student/internship/dept
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/student/internship/dept")
-    public CommonResult<Page<StudentInternshipEnterpriseDeptVo>> studentInternshipEnterpriseDept(@RequestBody StudentInternshipEnterpriseDeptListVo studentInternshipEnterpriseDeptListVo) {
-        return enterpriseService.studentInternshipEnterpriseDept(studentInternshipEnterpriseDeptListVo);
-    }
-
-    /**
-     * 查询指定学校在企业实习的情况
-     * @param requestParmterModel
-     * @return
-     * @eo.name 查询指定学校在企业实习的情况
-     * @eo.url /enterprise/school/practice/list
-     * @eo.method post
-     * @eo.request-type json
-     * @param enterpriseSchoolPracticeListReqVo
-     */
-    @PostMapping("/enterprise/school/practice/list")
-    public CommonResult<Page<EnterpriseSchoolPracticeListVo>> getEnterpriseSchoolPracticeList(@RequestBody EnterpriseSchoolPracticeListReqVo enterpriseSchoolPracticeListReqVo) {
-        return enterpriseService.getEnterpriseSchoolPracticeList(enterpriseSchoolPracticeListReqVo);
-    }
-
-//<editor-fold defaultstate="collapsed" desc="delombok">
-//</editor-fold>
-    /**
-     * 分页查询
-     * @param page 分页对象
-     * @param enterprise 
-     * @return
-     * @eo.name 分页查询
-     * @eo.url /enterprise/list
-     * @eo.method post
-     * @eo.request-type json
-     * @param requestParmterModel
-     */
-    @PostMapping("/enterprise/list")
-    public CommonResult getEnterpriseList(@RequestBody Map reqVo) {
-        Page page = BeanUtil.mapToBean(reqVo, Page.class, true);
-        Enterprise enterprise = BeanUtil.mapToBean(reqVo, Enterprise.class, true);
-        return enterpriseService.enterpriseList(page, enterprise);
-    }
-
-    /**
-     * 注册企业
-     * @param enterpriseInfoVo
-     * @return
-     * @eo.name 注册企业
-     * @eo.url /enterprise/register
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/register")
-    public CommonResult enterpriseRegister(@RequestBody EnterpriseInfoVo enterpriseInfoVo) {
-        return enterpriseService.enterpriseRegister(enterpriseInfoVo);
-    }
-
-    /**
-     * 修改企业
-     * @param enterpriseInfoVo
-     * @return
-     * @eo.name 修改企业
-     * @eo.url /enterprise/update
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/update")
-    public CommonResult enterpriseUpdate(@RequestBody EnterpriseInfoVo enterpriseInfoVo) {
-        return enterpriseService.enterpriseUpdate(enterpriseInfoVo);
-    }
-
-    /**
-     * 修改企业基本信息
-     * @param enterpriseInfoVo
-     * @return
-     * @eo.name 修改企业基本信息
-     * @eo.url /enterprise/basic/update
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/basic/update")
-    public CommonResult enterpriseBasicUpdate(@RequestBody Enterprise enterprise) {
-        return enterpriseService.enterpriseBasicUpdate(enterprise);
-    }
-
-    /**
-     * 当前登陆企业详情
-     * @return
-     * @eo.name 当前登陆企业详情
-     * @eo.url /enterprise/information
-     * @eo.method post
-     * @eo.request-type formdata
-     */
-    @PostMapping("/enterprise/information")
-    public CommonResult enterpriseInformation() throws UnsupportedEncodingException {
-        return enterpriseService.enterpriseInformation(SecurityFrameworkUtils.getLoginUserId());
-    }
-
-    /**
-     * 通过id查询
-     * @param enterpriseId
-     * @return R
-     * @eo.name 通过id查询
-     * @eo.url /enterprise/detail
-     * @eo.method post
-     * @eo.request-type json
-     * @param requestParmterModel
-     */
-    @PostMapping("/enterprise/detail")
-    public CommonResult getById(@RequestBody Map reqVo) {
-        return enterpriseService.enterpriseDetail(Long.valueOf( reqVo.getOrDefault("enterpriseId",0).toString()) );
-    }
-
-    /**
-     * 新增
-     * @param enterprise 
-     * @return R
-     * @eo.name 新增
-     * @eo.url /enterprise/add
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/add")
-    public CommonResult save(@RequestBody Enterprise enterprise) {
-        return CommonResult.success(enterpriseService.save(enterprise));
-    }
-
-//    /**
-//     * 修改
-//     * @param enterprise
-//     * @return R
-//     * @eo.name 修改
-//     * @eo.url /enterprise/update
-//     * @eo.method post
-//     * @eo.request-type json
-//     */
-//    @PostMapping("/enterprise/update")
-//    public Result updateById(@RequestBody Enterprise enterprise) {
-//        return Result.restResultSuccess(enterpriseService.updateById(enterprise));
-//    }
-    /**
-     * 通过id删除
-     * @param enterpriseId
-     * @return R
-     * @eo.name 通过id删除
-     * @eo.url /enterprise/del
-     * @eo.method post
-     * @eo.request-type formdata
-     */
-    @PostMapping("/enterprise/del")
-    public CommonResult removeById(@RequestBody EnterpriseIdReqVo enterpriseIdReqVo) {
-        /**
-                  UpdateWrapper updateWrapper  =new UpdateWrapper();
-                     updateWrapper.eq("id",id);
-                     updateWrapper.set("del",1);
-                     enterpriseService.update(updateWrapper);
-            **/
-        return CommonResult.success(enterpriseService.removeById(enterpriseIdReqVo.getEnterpriseId()));
-    }
-}

+ 7 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitListReqVo.java

@@ -142,4 +142,11 @@ public class EnterpriseRecruitListReqVo {
      */
     private String jobCode;
 
+
+
+    /**
+     * 招聘会id,示例值(1)
+     */
+    private Long   jobFairId ;//
+
 }

+ 320 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseVo.java

@@ -0,0 +1,320 @@
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class EnterpriseVo {
+
+    /**
+     *
+     */
+    private Long enterpriseId;
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+    /**
+     * 企业详细地址
+     */
+    private String enterpriseAddress;
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 企业所在省
+     */
+    private String provinceCode;
+    /**
+     * 企业所在市
+     */
+    private String cityCode;
+    /**
+     * 企业所在区域
+     */
+    //@TableField("`regionCode`")
+    private String regionCode;
+
+    private String  authStatus;
+
+
+    /**
+     * 介绍
+     */
+    private String  introduce;
+
+    /**
+     * 标签
+     */
+    private List<Map> tages =new ArrayList<>();
+
+    /**
+     * 站点地址
+     */
+    private String  site;
+
+    /**
+     * 头像
+     */
+    private String headImg;
+
+    /**
+     * 环境照片s
+     */
+    private List<String> photos =new ArrayList<>();
+
+    private String phone;
+
+    private String email;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+
+
+    /**
+     * 0.国有企业 1.民营企业 2.股份制企业 3.外资企业 4.合作企业 5.事业单位
+     */
+    private Integer tradeCategory;
+
+    /**
+     * 企业员工昵称
+     */
+    @TableField("enterprise_employee_nickname")
+    private String enterpriseEmployeeNickname;
+
+
+    /**
+     * 企业员工昵称
+     */
+    private String enterpriseEmployeePosition;
+
+    /**
+     * 公司行业
+     */
+    private String  enterpriseIndustry;
+
+    /**
+     * 公司行业Id
+     */
+    private Long enterpriselndustryId;
+
+    private String employeeSex;
+
+    /**
+     * 是否超级管理员
+     * 0.不是 1.是
+     */
+    private Integer superAdmin;
+
+    private String scaleStr;
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseAddress() {
+        return enterpriseAddress;
+    }
+
+    public void setEnterpriseAddress(String enterpriseAddress) {
+        this.enterpriseAddress = enterpriseAddress;
+    }
+
+
+
+    public LocalDateTime getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(LocalDateTime createDate) {
+        this.createDate = createDate;
+    }
+
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getRegionCode() {
+        return regionCode;
+    }
+
+    public void setRegionCode(String regionCode) {
+        this.regionCode = regionCode;
+    }
+
+    public String getAuthStatus() {
+        return authStatus;
+    }
+
+    public void setAuthStatus(String authStatus) {
+        this.authStatus = authStatus;
+    }
+
+    public String getIntroduce() {
+        return introduce;
+    }
+
+    public void setIntroduce(String introduce) {
+        this.introduce = introduce;
+    }
+
+    public List<Map> getTages() {
+        return tages;
+    }
+
+    public void setTages(List<Map> tages) {
+        this.tages = tages;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
+
+    public List<String> getPhotos() {
+        return photos;
+    }
+
+    public void setPhotos(List<String> photos) {
+        this.photos = photos;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+
+
+    public Integer getTradeCategory() {
+        return tradeCategory;
+    }
+
+    public void setTradeCategory(Integer tradeCategory) {
+        this.tradeCategory = tradeCategory;
+    }
+
+    public String getEnterpriseEmployeeNickname() {
+        return enterpriseEmployeeNickname;
+    }
+
+    public void setEnterpriseEmployeeNickname(String enterpriseEmployeeNickname) {
+        this.enterpriseEmployeeNickname = enterpriseEmployeeNickname;
+    }
+
+    public String getEnterpriseEmployeePosition() {
+        return enterpriseEmployeePosition;
+    }
+
+    public void setEnterpriseEmployeePosition(String enterpriseEmployeePosition) {
+        this.enterpriseEmployeePosition = enterpriseEmployeePosition;
+    }
+
+    public String getEnterpriseIndustry() {
+        return enterpriseIndustry;
+    }
+
+    public void setEnterpriseIndustry(String enterpriseIndustry) {
+        this.enterpriseIndustry = enterpriseIndustry;
+    }
+
+    public Long getEnterpriselndustryId() {
+        return enterpriselndustryId;
+    }
+
+    public void setEnterpriselndustryId(Long enterpriselndustryId) {
+        this.enterpriselndustryId = enterpriselndustryId;
+    }
+
+    public String getEmployeeSex() {
+        return employeeSex;
+    }
+
+    public void setEmployeeSex(String employeeSex) {
+        this.employeeSex = employeeSex;
+    }
+
+    public Integer getSuperAdmin() {
+        return superAdmin;
+    }
+
+    public void setSuperAdmin(Integer superAdmin) {
+        this.superAdmin = superAdmin;
+    }
+
+    public String getScaleStr() {
+        return scaleStr;
+    }
+
+    public void setScaleStr(String scaleStr) {
+        this.scaleStr = scaleStr;
+    }
+}

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitInfoVo.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class EnterpriseRecruitInfoVo {
     private EnterpriseRecruit enterpriseRecruit;
 
-    private Enterprise enterprise;
+    private Object enterprise;
 
     private List<EnterpriseRecruitTag>  enterpriseRecruitTags;
 

+ 126 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseConvert.java

@@ -0,0 +1,126 @@
+package com.citupro.module.menduner.flames.convert.resp;
+
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlameJobRespVO;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlamesEnterpriseBusinessRespVO;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseDetailRespVO;
+
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseJobRespVO;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.EnterpriseVo;
+import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
+import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
+import com.citupro.module.menduner.flames.dal.mysql.EnterpriseQualifications;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class EnterpriseConvert {
+
+
+    public static EnterpriseVo appEnterpriseJobRespVOConvertEnterpriseVo(AppFlamesEnterpriseJobRespVO item){
+        AppFlamesEnterpriseBaseSimpleRespVO enterpriseVo = item.getEnterprise();
+        EnterpriseVo enterprise =new EnterpriseVo();
+        enterprise.setEnterpriseId(enterpriseVo.getId());
+        enterprise.setEnterpriseName(enterpriseVo.getName());
+        enterprise.setScaleStr(enterpriseVo.getScale());
+        enterprise.setHeadImg(item.getEnterprise().getLogoUrl());
+        List<Map> tages =new ArrayList<>();
+        enterprise.setTages(tages);
+        if(null!= enterpriseVo.getTagList()) {
+            enterpriseVo.getTagList().forEach(item2 -> tages.add(ImmutableMap.of("title", item2)));
+        }
+        if(null!= enterpriseVo.getWelfareList()) {
+            enterpriseVo.getWelfareList().forEach(item2 -> tages.add(ImmutableMap.of("title", item2)));
+        }
+        return enterprise;
+    }
+
+
+
+    public static EnterpriseVo appFlameJobRespVOConvertEnterpriseVo(AppFlameJobRespVO item ){
+
+        EnterpriseVo enterprise =new EnterpriseVo();
+        enterprise.setEnterpriseId(item.getEnterprise().getId());
+        enterprise.setEnterpriseAddress(item.getBusiness().getAddress());
+        enterprise.setEnterpriseIndustry(item.getBusiness().getIndustry());
+        enterprise.setEnterpriseName(item.getEnterprise().getName());
+//            enterprise.set(item.getBusiness().getArea());
+        enterprise.setContacts(item.getEnterprise().getContact());
+        enterprise.setPhone(item.getEnterprise().getPhone());
+        enterprise.setCreateDate(item.getEnterprise().getCreateTime());
+//            enterprise.setProvinceCode();
+//            enterprise.setCityCode();
+//            enterprise.setRegionCode();
+        enterprise.setIntroduce(item.getEnterprise().getIntroduce());
+//            enterprise.setTages();  //标签
+        enterprise.setSite(item.getEnterprise().getWebsite());
+        enterprise.setHeadImg(item.getEnterprise().getLogoUrl()); ;// 无图片
+        enterprise.setPhotos(item.getEnterprise().getAlbumList());
+//            enterprise.setEmail("");
+        enterprise.setScaleStr(item.getEnterprise().getScale());
+//            enterprise.setTradeCategory(""); // 单位类型   0.国有企业 1.民营企业 2.股份制企业 3.外资企业 4.合作企业 5.事业单
+        enterprise.setEnterpriseEmployeeNickname(item.getEnterprise().getContact());
+//            enterprise.setEnterpriseEmployeePosition();  //招聘员岗位没有
+        enterprise.setEnterpriseIndustry(item.getBusiness().getIndustry());
+//            enterprise.setEmployeeSex(); // 没有
+        enterprise.setSuperAdmin(0);
+        return enterprise;
+    }
+
+
+    public static EnterpriseInfoVo appEnterpriseDetailRespVOConvertEnterpriseInfoVo(AppFlamesEnterpriseDetailRespVO item ){
+        EnterpriseInfoVo  enterpriseInfoVo =new EnterpriseInfoVo();
+        Enterprise enterprise =new Enterprise();
+        enterprise.setEnterpriseId(item.getEnterprise().getId());
+
+        if(item.getBusiness()==null){
+            item.setBusiness(new AppFlamesEnterpriseBusinessRespVO());
+        }
+        enterprise.setEnterpriseAddress(item.getBusiness().getAddress());
+        enterprise.setEnterpriseIndustry(item.getBusiness().getIndustry());
+
+
+        enterprise.setEnterpriseName(item.getEnterprise().getName());
+//            enterprise.set(item.getBusiness().getArea());
+        enterprise.setContacts(item.getEnterprise().getContact());
+        enterprise.setPhone(item.getEnterprise().getPhone());
+        enterprise.setCreateDate(item.getEnterprise().getCreateTime());
+//            enterprise.setProvinceCode();
+//            enterprise.setCityCode();
+//            enterprise.setRegionCode();
+        enterprise.setIntroduce(item.getEnterprise().getIntroduce());
+//            enterprise.setTages();  //标签
+        enterprise.setSite(item.getEnterprise().getWebsite());
+        enterprise.setHeadImg(item.getEnterprise().getLogoUrl()); ;// 无图片
+        enterprise.setPhotos(item.getEnterprise().getAlbumList());
+//            enterprise.setEmail("");
+        enterprise.setScaleStr(item.getEnterprise().getScale());
+//            enterprise.setTradeCategory(""); // 单位类型   0.国有企业 1.民营企业 2.股份制企业 3.外资企业 4.合作企业 5.事业单
+        enterprise.setEnterpriseEmployeeNickname(item.getEnterprise().getContact());
+//            enterprise.setEnterpriseEmployeePosition();  //招聘员岗位没有
+        enterprise.setEnterpriseIndustry(item.getBusiness().getIndustry());
+//            enterprise.setEmployeeSex(); // 没有
+        enterprise.setSuperAdmin(0);
+        EnterpriseQualifications enterpriseQualifications =new EnterpriseQualifications();
+        enterpriseQualifications.setEnterpriseId(item.getEnterprise().getId());
+        enterpriseQualifications.setEnterpriseUnifiedCreditCode(item.getBusiness().getCode());
+        enterpriseQualifications.setEnterpriseBusinessLicenseImg(item.getBusiness().getBusinessUrl());
+        enterpriseQualifications.setEnterpriseBusinessLicenseExtime(item.getBusiness().getBusinessTerm());
+        enterpriseQualifications.setEnterpriseLegalPersonName(item.getBusiness().getRepresentative());
+//        enterpriseQualifications.setEnterpriseLegalPersonIdCard();   //身份证号
+//        enterpriseQualifications.setEnterpriseLegalPersonIdCardImg1(); // 身份证正面
+//        enterpriseQualifications.setEnterpriseLegalPersonIdCardImg2(); // 身份证反面
+//        enterpriseQualifications.setenterpriseLegalPersonIdCardExtime(); // 身份证有效期
+//        enterpriseQualifications.setEnterpriseApprovedDate(); // 审核日期
+//        enterpriseQualifications.setEnterpriseAplicationDate(); // 申请日期
+//        enterpriseQualifications.getProvinceCode();
+//        enterprise.setCityCode();
+//          enterprise.setRegionCode();
+        enterpriseInfoVo.setEnterpriseQualifications(enterpriseQualifications);
+        enterpriseInfoVo.setEnterprise(enterprise);
+
+        return enterpriseInfoVo;
+    }
+}

+ 47 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseRecruitConvert.java

@@ -0,0 +1,47 @@
+package com.citupro.module.menduner.flames.convert.resp;
+
+
+
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlameJobRespVO;
+import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EnterpriseRecruitConvert {
+
+
+    public static EnterpriseRecruit enterpriseRecruitConvertEnterpriseRecruit(AppFlameJobRespVO item){
+        EnterpriseRecruit enterpriseRecruit = new EnterpriseRecruit();
+        enterpriseRecruit.setEnterpriseRecruitId(item.getJob().getId());
+        enterpriseRecruit.setEnterpriseRecruitJobName(item.getJob().getName());
+        enterpriseRecruit.setJobCode(null== item.getJob().getPositionId()?"":  item.getJob().getPositionId().toString());
+        enterpriseRecruit.setAddrress(item.getJob().getAddress());
+        enterpriseRecruit.setEnterpriseRecruitStatus("0");
+        enterpriseRecruit.setEnterpriseRecruitType(2);
+        enterpriseRecruit.setEduName(item.getJob().getEduType());
+        enterpriseRecruit.setEnterpriseRecruitDetail(item.getJob().getContent()); // 职位描述无
+//            enterpriseRecruit.setEnterpriseRecruitSalary();  //薪酬 非区间
+        enterpriseRecruit.setPayFrom(item.getJob().getPayFrom());
+        enterpriseRecruit.setPayTo(item.getJob().getPayTo());
+        enterpriseRecruit.setPayUnit(item.getJob().getPayUnit());
+        enterpriseRecruit.setFrequency(null==item.getJobExtend().getFrequency()?new HashMap<>():(Map<String, Object>) item.getJobExtend().getFrequency());
+        enterpriseRecruit.setEnterpriseRecruitHitNum(0);
+        enterpriseRecruit.setHot(0);
+//            enterpriseRecruit
+        enterpriseRecruit.setEnterpriseId(item.getEnterprise().getId());
+//            enterpriseRecruit.setEnterpriseRecruitSendDate();
+        enterpriseRecruit.setJobDept(item.getJobExtend().getDept());
+        enterpriseRecruit.setJobName(item.getJob().getName());
+        enterpriseRecruit.setMajorCode(null==item.getJobExtend().getMajorId()?"":item.getJobExtend().getMajorId().toString());
+        enterpriseRecruit.setMajorName(item.getJobExtend().getMajorName());
+        enterpriseRecruit.setSort(0L);
+        enterpriseRecruit.setWorkCityCode(null==item.getJob().getAreaId()?"":item.getJob().getAreaId().toString());
+        enterpriseRecruit.setWorkCityName(item.getJob().getAreaName());
+        enterpriseRecruit.setEnterpriseRecruitSendDate(item.getJobExtend().getCreateTime());
+//            enterpriseRecruit.setWorkProvinceCode();
+//            enterpriseRecruit.setWorkProvinceName();
+
+        return enterpriseRecruit;
+    }
+}

+ 24 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/convert/resp/EnterpriseRecruitTagConvertVo.java

@@ -0,0 +1,24 @@
+package com.citupro.module.menduner.flames.convert.resp;
+
+
+
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlameJobRespVO;
+import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EnterpriseRecruitTagConvertVo {
+
+    public static List<EnterpriseRecruitTag> appFlameJobRespVOConvert(AppFlameJobRespVO item){
+        List<EnterpriseRecruitTag> enterpriseRecruitTags  = new ArrayList<>();
+
+
+        for (String tag : item.getJob().getTagList()) {
+            EnterpriseRecruitTag enterpriseRecruitTag =new EnterpriseRecruitTag();
+            enterpriseRecruitTag.setTitle(tag);
+            enterpriseRecruitTags.add(enterpriseRecruitTag);
+        }
+        return enterpriseRecruitTags;
+    }
+}

+ 2 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/Enterprise.java

@@ -172,8 +172,6 @@ private String regionCode;
         private Integer superAdmin;
 
 
-
-
-
-
+        @TableField(exist = false)
+        private String scaleStr;
 }

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/EnterpriseQualifications.java

@@ -42,7 +42,7 @@ private String enterpriseBusinessLicenseImg;
  * 营业执照有效期
  */
     //@TableField("`enterpriseBusinessLicenseExtime`")
-private LocalDateTime enterpriseBusinessLicenseExtime;
+private String enterpriseBusinessLicenseExtime;
 /**
  * 企业法人姓名
  */

+ 12 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/dal/mysql/EnterpriseRecruit.java

@@ -143,6 +143,18 @@ public class EnterpriseRecruit extends Model<EnterpriseRecruit> {
 
         private Long sort;
 
+
+
+        private String payUnit;
+
+
+        private BigDecimal payFrom;
+
+        /**
+         * 薪酬to
+         */
+        private BigDecimal payTo;
+
 //        private
 
 //        public static void main(String[] args) {

+ 4 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/framework/rpc/config/RpcConfiguration.java

@@ -1,11 +1,13 @@
 package com.citupro.module.menduner.flames.framework.rpc.config;
 
 
-import com.citupro.module.menduner.flames.api.EnterpriseRecruitServiceApi;
+import com.citu.module.menduner.system.api.flames.enterprise.EnterpriseServiceApi;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.EnterpriseRecruitServiceApi;
+import com.citu.module.menduner.system.api.flames.job.fair.JobFairServiceApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {EnterpriseRecruitServiceApi.class})
+@EnableFeignClients(clients = {EnterpriseRecruitServiceApi.class, EnterpriseServiceApi.class, JobFairServiceApi.class})
 public class RpcConfiguration {
 }

+ 11 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/mapper/PraciceSubmitRecordMapper.java

@@ -15,4 +15,15 @@ public interface PraciceSubmitRecordMapper extends BaseMapper<PraciceSubmitRecor
 
     @Select("select count(1) from practice_submit_record where  enterprise_recruit_id = #{enterpriseRecruitId} and  `status` in (0,1,3) ")
     Integer getEnterpriseRecruitWaitStudentCount(@Param("enterpriseRecruitId") Long enterpriseRecruitId);
+
+    @Select("   SELECT " +
+            "        count( 1 ) " +
+            "        FROM " +
+            "        practice_submit_record " +
+            "        WHERE " +
+            "        `status` = 2 " +
+            "        AND   if( now()>internship_end_date,'实习结束', if( now() >= job_join_date,'实习中','等待实习' ) )='实习中' " +
+            "          and  enterprise_id=#{enterpriseId} " +
+            "        and student_id in ( select student_id from student   where school_id = #{schoolId} )")
+    Integer selectPracticeStudentCount(@Param("schoolId") Long schoolId,@Param("enterpriseId") Long enterpriseId);
 }

+ 0 - 8
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/ClientService.java

@@ -1,8 +0,0 @@
-package com.citupro.module.menduner.flames.service;
-
-
-import com.citu.framework.common.pojo.CommonResult;
-
-public interface ClientService {
-    CommonResult getClient(Long userId, Integer clientType);
-}

+ 0 - 34
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/EnterpriseRecruitService.java

@@ -1,34 +0,0 @@
-package com.citupro.module.menduner.flames.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EenterpriseRecruitSaveReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitListReqVo;
-import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
-import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
-
-import java.io.InputStream;
-import java.util.List;
-
-/**
- * 
- *
- * @author code generator
- * @date 2023-06-06 09:56:21
- */
-public interface EnterpriseRecruitService extends IService<EnterpriseRecruit> {
-
-    CommonResult enterpriseRecruitSave(EnterpriseRecruit enterpriseRecruit, List<EnterpriseRecruitTag> enterpriseRecruitTagList);
-
-
-    EnterpriseRecruit getEnterpriseRecruitById(Long enterpriseRecruitId);
-
-    CommonResult getEnterpriseRecruitList(EnterpriseRecruitListReqVo enterpriseRecruitListReqVo);
-
-    CommonResult enterpriseRecruitSaveAll(List<EenterpriseRecruitSaveReqVo> enterpriseRecruits);
-
-    CommonResult enterpriseRecruitUpload(InputStream inputStream, String originalFilename,Long enterpriseId);
-
-    void updateSort(Long enterpriseRecruitId);
-}

+ 4 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/PraciceSubmitRecordService.java

@@ -47,4 +47,8 @@ public interface PraciceSubmitRecordService extends IService<PraciceSubmitRecord
     CommonResult praciceSubmitRecordStudentBack(Long practiceSubmitRecordId, Long studentId, String refuseMsg, String appType);
 
     CommonResult praciceSubmitRecordStudentInterview(Long practiceSubmitRecordId, Long studentId, LocalDateTime interviewDate , String appType);
+
+    List<Long> getInternshipEnterpriseBySchoolId(Long schoolId);
+
+    Integer selectPracticeStudentCount(Long schoolId, Long enterpriseId);
 }

+ 9 - 32
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/EnterpriseService.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/proxy/EnterpriseProxyService.java

@@ -1,55 +1,32 @@
-package com.citupro.module.menduner.flames.service;
+package com.citupro.module.menduner.flames.service.proxy;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseDetailRespVO;
 import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseSchoolPracticeListReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipEnterpriseDeptListVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
 import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseSchoolPracticeListVo;
 import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipEnterpriseDeptVo;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 
 
 import java.util.List;
+import java.util.Map;
 
-/**
- * 
- *
- * @author code generator
- * @date 2023-06-06 09:56:21
- */
-public interface EnterpriseService extends IService<Enterprise> {
-
-    CommonResult enterpriseRegister(EnterpriseInfoVo enterpriseInfoVo);
+public interface EnterpriseProxyService {
+    CommonResult<Page<EnterpriseSchoolPracticeListVo>> getEnterpriseSchoolPracticeList(EnterpriseSchoolPracticeListReqVo enterpriseSchoolPracticeListReqVo);
 
-    CommonResult<EnterpriseInfoVo> enterpriseInformation(Long userId);
+    CommonResult<Page<StudentInternshipEnterpriseDeptVo>> studentInternshipEnterpriseDept(StudentInternshipEnterpriseDeptListVo studentInternshipEnterpriseDeptListVo);
 
     CommonResult enterpriseList(Page page, Enterprise object);
 
     CommonResult enterpriseDetail(Long enterpriseId);
 
-    Enterprise getEnterpriseById(Long enterpriseId);
-
-    /**
-     * 获取在校实习的学生
-     * @param enterpriseId
-     * @return
-     */
-    List<Long> getInternshipStudentIdByEnterpriseId(Long enterpriseId);
-
-    CommonResult<Page<EnterpriseSchoolPracticeListVo>> getEnterpriseSchoolPracticeList(EnterpriseSchoolPracticeListReqVo enterpriseSchoolPracticeListReqVo);
-
-    CommonResult<Page<StudentInternshipEnterpriseDeptVo>> studentInternshipEnterpriseDept(StudentInternshipEnterpriseDeptListVo studentInternshipEnterpriseDeptListVo);
-
     CommonResult enterpriseWorkColud(Long schoolId);
 
-    void updateEnterpriseAgreeAuthStatus(Long entityId);
+    Map<Long, AppFlamesEnterpriseDetailRespVO> getEnterpriseList(List<Long> enterpriseIds);
 
-    void updateEnterpriseRefuseAuthStatus(Long entityId);
-
-    CommonResult enterpriseUpdate(EnterpriseInfoVo enterpriseInfoVo);
-
-    CommonResult enterpriseBasicUpdate(Enterprise enterprise);
+    Enterprise getEnterpriseById(Long enterpriseId);
 
+    Enterprise getById(Long enterpriseId);
 }

+ 25 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/service/proxy/EnterpriseRecruitProxyService.java

@@ -0,0 +1,25 @@
+package com.citupro.module.menduner.flames.service.proxy;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlameJobRespVO;
+import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitInfoVo;
+import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface EnterpriseRecruitProxyService {
+
+    CommonResult<Page<EnterpriseRecruitInfoVo>> getEnterpriseRecruitList(EnterpriseRecruitListReqVo enterpriseRecruit);
+
+    EnterpriseRecruit getEnterriseRecruitById(Long enterpriseRecruitId);
+
+    void updateSort(Long enterpriseRecruitId);
+
+    Map<Long, AppFlameJobRespVO> getEnterpriseRecruitByIds(List<Long> enterpriseRecruitId);
+
+    EnterpriseRecruit getEnterpriseRecruitById(Long enterpriseRecruitId);
+}

+ 0 - 81
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/ClientServiceImpl.java

@@ -1,81 +0,0 @@
-package com.citupro.module.menduner.flames.serviceimpl;
-
-import cn.hutool.core.util.IdUtil;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolInfoVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentInfoVo;
-import com.citupro.module.menduner.flames.dal.mysql.Student;
-import com.citupro.module.menduner.flames.service.ClientService;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
-import com.citupro.module.menduner.flames.service.SchoolService;
-import com.citupro.module.menduner.flames.service.StudentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class ClientServiceImpl implements ClientService {
-    @SuppressWarnings("all")
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(ClientServiceImpl.class);
-    SchoolService schoolService;
-    StudentService studentService;
-    EnterpriseService enterpriseService;
-
-    @Override
-    public CommonResult getClient(Long userId, Integer clientType) {
-        StudentInfoVo studentInfoVo = studentService.getStudentInformationByUserId(userId).getData();
-        SchoolInfoVo schoolInfoVo = schoolService.getSchoolInformation(userId).getData();
-        EnterpriseInfoVo enterpriseInfoVo = enterpriseService.enterpriseInformation(userId).getData();
-        Map<String, Object> retMap = new HashMap<>();
-        retMap.put("clientType", 0);
-        retMap.put("data", studentInfoVo);
-        if (null != studentInfoVo && null == studentInfoVo.getStudent()) {
-            log.info("新增学生!");
-            Student student = new Student();
-            student.setStudentId(IdUtil.getSnowflake(1L, 1L).nextId());
-            student.setStudentUserId(userId);
-            student.setStudentName("匿名用户:" + userId);
-            studentService.studentAdd(student);
-            studentInfoVo.setStudent(student);
-        }
-        if (null != schoolInfoVo && null != schoolInfoVo.getSchool() && null == clientType) {
-            retMap.put("clientType", 1);
-            retMap.put("data", schoolInfoVo);
-        }
-        if (null != enterpriseInfoVo && null != enterpriseInfoVo.getEnterprise() && null == clientType) {
-            retMap.put("clientType", 2);
-            retMap.put("data", enterpriseInfoVo);
-        }
-        if (Integer.valueOf(1).equals(clientType)) {
-            retMap.put("clientType", 1);
-            retMap.put("data", schoolInfoVo);
-        }
-        if (Integer.valueOf(2).equals(clientType)) {
-            retMap.put("clientType", 2);
-            retMap.put("data", enterpriseInfoVo);
-        }
-        return CommonResult.success(retMap);
-    }
-
-    @Autowired
-    public void setSchoolService(SchoolService schoolService) {
-        this.schoolService = schoolService;
-    }
-
-//<editor-fold defaultstate="collapsed" desc="delombok">
-//</editor-fold>
-    @Autowired
-    public void setShudentSerbice(StudentService shudentSerbice) {
-        this.studentService = shudentSerbice;
-    }
-
-//<editor-fold defaultstate="collapsed" desc="delombok">
-//</editor-fold>
-    @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
-        this.enterpriseService = enterpriseService;
-    }
-}

+ 3 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/CommentServiceImpl.java

@@ -13,6 +13,7 @@ import com.citupro.module.menduner.flames.controller.base.vo.CommentInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.Comment;
 import com.citupro.module.menduner.flames.mapper.CommentMapper;
 import com.citupro.module.menduner.flames.service.*;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +36,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
 
     StudentService studentService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     SchoolService schoolService;
 
@@ -121,7 +122,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         this.studentService = studentService;
     }
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 4 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseRecruitPlanServiceImpl.java

@@ -9,12 +9,12 @@ import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitPl
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitPlan;
 import com.citupro.module.menduner.flames.mapper.EnterpriseRecruitPlanMapper;
 import com.citupro.module.menduner.flames.service.EnterpriseRecruitPlanService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.transaction.annotation.Transactional;
-import com.citupro.module.menduner.flames.service.EnterpriseRecruitService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +31,7 @@ public class EnterpriseRecruitPlanServiceImpl
 
     EnterpriseRecruitPlanMapper enterpriseRecruitPlanMapper;
 
-    EnterpriseRecruitService  EnterpriseRecruitService;
+    EnterpriseRecruitProxyService enterpriseRecruitService;
     
 
     public CommonResult getEnterpriseRecruitPlanList(EnterpriseRecruitPlanListReqVo reqVo){
@@ -106,8 +106,8 @@ public class EnterpriseRecruitPlanServiceImpl
     }
 
     @Autowired
-    public void setEnterpriseRecruitService(EnterpriseRecruitService service){
-        this.EnterpriseRecruitService=service;
+    public void setEnterpriseRecruitService(EnterpriseRecruitProxyService service){
+        this.enterpriseRecruitService=service;
     }
     
 

+ 0 - 226
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseRecruitServiceImpl.java

@@ -1,226 +0,0 @@
-package com.citupro.module.menduner.flames.serviceimpl;
-
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-import com.alibaba.excel.read.listener.PageReadListener;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EenterpriseRecruitSaveReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitExcelVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitInfoVo;
-import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
-import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
-import com.citupro.module.menduner.flames.dal.mysql.Area;
-import com.citupro.module.menduner.flames.mapper.EnterpriseRecruitMapper;
-import com.citupro.module.menduner.flames.service.*;
-import com.citupro.module.menduner.flames.service.api.SysAreaServiceApi;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- *
- * @author code generator
- * @date 2023-06-06 09:56:21
- */
-@Service
-public class EnterpriseRecruitServiceImpl
-        extends ServiceImpl<EnterpriseRecruitMapper, EnterpriseRecruit> implements EnterpriseRecruitService {
-
-    EnterpriseRecruitMapper enterpriseRecruitMapper;
-
-    EnterpriseService enterpriseService;
-
-    EnterpriseRecruitTagService enterpriseRecruitTagService;
-
-    JobDictionaryService jobDictionaryService;
-    // TODO
-    SysAreaServiceApi sysAreaServiceApi;
-
-    PraciceSubmitRecordService praciceSubmitRecordService;
-
-    @Override
-    @Transactional
-    public CommonResult enterpriseRecruitSave(EnterpriseRecruit enterpriseRecruit, List<EnterpriseRecruitTag> tags) {
-
-        if(null == enterpriseRecruit.getEnterpriseRecruitId()){
-            enterpriseRecruit.setEnterpriseRecruitId(IdUtil.getSnowflake(1L,1L).nextId());
-            enterpriseRecruit.setEnterpriseRecruitSendDate(LocalDateTime.now());
-            enterpriseRecruit.setEnterpriseRecruitStatus("招聘中");
-            enterpriseRecruit.setEnterpriseRecruitHitNum(0);
-            enterpriseRecruit.setSort(System.currentTimeMillis()/1000);
-            enterpriseRecruitMapper.insert(enterpriseRecruit);
-            tags.forEach(item->item.setEnterpriseRecruitId(enterpriseRecruit.getEnterpriseRecruitId()));
-        }else {
-            tags.forEach(item->item.setEnterpriseRecruitId(enterpriseRecruit.getEnterpriseRecruitId()));
-            enterpriseRecruitMapper.updateById(enterpriseRecruit);
-        }
-        enterpriseRecruitTagService.saveAll(tags,enterpriseRecruit.getEnterpriseRecruitId());
-        return CommonResult.success(enterpriseRecruit);
-    }
-
-    @Override
-    public EnterpriseRecruit getEnterpriseRecruitById(Long enterpriseRecruitId) {
-        if(null ==enterpriseRecruitId){
-            return null;
-        }
-        return enterpriseRecruitMapper.selectById(enterpriseRecruitId);
-    }
-
-    @Override
-    public CommonResult getEnterpriseRecruitList(EnterpriseRecruitListReqVo enterpriseRecruitListReqVo) {
-        Page page =Page.of(enterpriseRecruitListReqVo.getCurrent(),enterpriseRecruitListReqVo.getSize());
-        page.setOrders(enterpriseRecruitListReqVo.getOrders());
-        EnterpriseRecruit object =new EnterpriseRecruit();
-        BeanUtils.copyProperties(enterpriseRecruitListReqVo,object);
-        object.setFrequency(null);
-        String enterpriseRecruitJobName = object.getEnterpriseRecruitJobName();
-        object.setEnterpriseRecruitJobName(null);
-        LambdaQueryWrapper<EnterpriseRecruit> queryWrapper =new LambdaQueryWrapper<>(object);
-        queryWrapper.in(null!=enterpriseRecruitListReqVo.getEnterpriseRecruitTypes() && enterpriseRecruitListReqVo.getEnterpriseRecruitTypes().size() > 0
-                ,EnterpriseRecruit::getEnterpriseRecruitType,enterpriseRecruitListReqVo.getEnterpriseRecruitTypes() );
-        queryWrapper.ge(null!=enterpriseRecruitListReqVo.getStartEnterpriseRecruitSalary(),EnterpriseRecruit::getEnterpriseRecruitSalary,enterpriseRecruitListReqVo.getStartEnterpriseRecruitSalary());
-        queryWrapper.le(null!=enterpriseRecruitListReqVo.getEndEnterpriseRecruitSalary(),EnterpriseRecruit::getEnterpriseRecruitSalary,enterpriseRecruitListReqVo.getEndEnterpriseRecruitSalary());
-        queryWrapper.like(StringUtils.isNotBlank(enterpriseRecruitJobName),EnterpriseRecruit::getEnterpriseRecruitJobName,enterpriseRecruitJobName);
-
-        queryWrapper.and(StringUtils.isNotBlank(enterpriseRecruitListReqVo.getSearchKey()),
-                qw->qw.like(EnterpriseRecruit::getEnterpriseRecruitJobName,enterpriseRecruitListReqVo.getSearchKey())
-                        .or()
-                        .like(EnterpriseRecruit::getJobName,enterpriseRecruitListReqVo.getSearchKey())
-                        .or()
-                        .apply("enterprise_id in (  select  enterprise_id  from enterprise  where enterprise_name like concat('%',{0},'%') ) ",enterpriseRecruitListReqVo.getSearchKey())
-        );
-//        queryWrapper.like(StringUtils.isNotBlank(enterpriseRecruitListReqVo.getSearchKey()), EnterpriseRecruit::getEnterpriseRecruitJobName,enterpriseRecruitListReqVo.getSearchKey());
-//        queryWrapper
-        queryWrapper.apply(null!=enterpriseRecruitListReqVo.getTradeCategory(),"  enterprise_id  in  ( select enterprise_id from enterprise  where  trade_category = {0}  ) ",enterpriseRecruitListReqVo.getTradeCategory());
-
-
-        queryWrapper.apply(null!=enterpriseRecruitListReqVo.getScale(),"  enterprise_id  in  ( select enterprise_id from enterprise  where  scale = {0}  ) ",enterpriseRecruitListReqVo.getScale());
-
-        queryWrapper.apply(null!=enterpriseRecruitListReqVo.getEnterpriseIndustry(),"  enterprise_id  in  ( select enterprise_id from enterprise  where  enterprise_industry = {0}  ) ",enterpriseRecruitListReqVo.getEnterpriseIndustry());
-
-
-
-        Page page1 = enterpriseRecruitMapper.selectPage(page, queryWrapper);
-//        Integer count = enterpriseRecruitMapper.selectCount(queryWrapper);
-
-        List<EnterpriseRecruitInfoVo> enterpriseRecruitInfoVos =new ArrayList<>();
-        page.getRecords().forEach(item->{
-            EnterpriseRecruitInfoVo enterpriseRecruitInfoVo =new EnterpriseRecruitInfoVo();
-            enterpriseRecruitInfoVo.setEnterpriseRecruit((EnterpriseRecruit) item);
-            enterpriseRecruitInfoVo.setEnterprise(enterpriseService.getEnterpriseById(enterpriseRecruitInfoVo.getEnterpriseRecruit().getEnterpriseId()));
-            enterpriseRecruitInfoVo.setEnterpriseRecruitTags(enterpriseRecruitTagService.getTagByEnterpriseRecruitId(((EnterpriseRecruit) item).getEnterpriseRecruitId()));
-            enterpriseRecruitInfoVo.setWaitStudentCount(praciceSubmitRecordService.getEnterpriseRecruitWaitStudentCount(enterpriseRecruitInfoVo.getEnterpriseRecruit().getEnterpriseRecruitId()));
-            enterpriseRecruitInfoVos.add(enterpriseRecruitInfoVo);
-        });
-        page1.setRecords(enterpriseRecruitInfoVos);
-//        page1.setTotal(count);
-
-        return CommonResult.success(page1);
-    }
-
-    @Override
-    @Transactional
-    public CommonResult enterpriseRecruitSaveAll(List<EenterpriseRecruitSaveReqVo> enterpriseRecruits) {
-        for (EenterpriseRecruitSaveReqVo enterpriseRecruit : enterpriseRecruits) {
-            CommonResult result = enterpriseRecruitSave(enterpriseRecruit.getEnterpriseRecruit(), enterpriseRecruit.getTags());
-
-        }
-        return CommonResult.success(null);
-    }
-
-    @Override
-    @Transactional
-    public CommonResult enterpriseRecruitUpload(InputStream inputStream, String originalFilename,Long enterpriseId) {
-        List<EnterpriseRecruitExcelVo> objects =new ArrayList<>();
-        PageReadListener listener = new PageReadListener<EnterpriseRecruitExcelVo>(list->objects.addAll(list));
-        ExcelReaderBuilder read = EasyExcel.read(inputStream, EnterpriseRecruitExcelVo.class,listener);
-//        read.excelType(ExcelTypeEnum.XLS);
-        read.sheet().doRead();
-        Map<String,JSONObject> cacheJSONObject =new HashMap<>();
-        List<EnterpriseRecruit> enterpriseRecruits =new ArrayList<>();
-        for (EnterpriseRecruitExcelVo enterpriseRecruitExcelVo : objects) {
-            EnterpriseRecruit enterpriseRecruit =new EnterpriseRecruit();
-            BeanUtils.copyProperties(enterpriseRecruitExcelVo,enterpriseRecruit);
-            Map<String,Object>  frequency =new HashMap<>();
-            frequency.put("dateType",enterpriseRecruitExcelVo.getWorkCategory());
-            frequency.put("day",enterpriseRecruitExcelVo.getWorkDay());
-            enterpriseRecruit.setFrequency(frequency);
-            enterpriseRecruit.setEnterpriseId(enterpriseId);
-//            enterpriseRecruit.setJobCode(jobDictionaryService.getJobDictionaryCodeByName(enterpriseRecruitExcelVo.getJobName()));
-            enterpriseRecruit.setEnterpriseRecruitStatus("招聘中");
-//            if(null == enterpriseRecruit.getJobCode()){
-//                return Result.restResultSuccess("请检查招聘标题:"+enterpriseRecruitExcelVo.getEnterpriseRecruitJobName()+"岗位名称是否正确!");
-//            }
-            String cacheKey =   enterpriseRecruitExcelVo.getWorkProvinceName()+enterpriseRecruitExcelVo.getWorkCityName();
-            JSONObject data =cacheJSONObject.get(cacheKey);
-            // 检查城市是否正确 省份是否正确
-            if(null ==data) {
-                 data = sysAreaServiceApi.getSysAreaCode(enterpriseRecruitExcelVo.getWorkProvinceName(), enterpriseRecruitExcelVo.getWorkCityName()).getData();
-                 cacheJSONObject.put(cacheKey, data);
-            }
-            if(null==data.get("province") || null == data.get("city")){
-//                Result.restResultSuccess("请检查招聘标题:"+enterpriseRecruitExcelVo.getEnterpriseRecruitJobName()+"的省市是否正确!");
-            }
-            enterpriseRecruit.setWorkCityCode( data.getObject("city", Area.class).getAreaCode());
-            enterpriseRecruit.setWorkProvinceCode( data.getObject("province", Area.class).getAreaCode());
-            enterpriseRecruits.add(enterpriseRecruit);
-        }
-        enterpriseRecruits.forEach(item-> enterpriseRecruitMapper.insert(item));
-        return CommonResult.success(enterpriseRecruits);
-    }
-
-    @Override
-    public void updateSort(Long enterpriseRecruitId) {
-        enterpriseRecruitMapper.update(null,
-                new LambdaUpdateWrapper<EnterpriseRecruit>()
-                .eq(EnterpriseRecruit::getEnterpriseRecruitId,enterpriseRecruitId)
-                        .set(EnterpriseRecruit::getSort,System.currentTimeMillis()/1000)
-        );
-    }
-
-    @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
-        this.enterpriseService = enterpriseService;
-    }
-
-    @Autowired
-    public void setEnterpriseRecruitMapper(EnterpriseRecruitMapper enterpriseRecruitMapper) {
-        this.enterpriseRecruitMapper = enterpriseRecruitMapper;
-    }
-    @Autowired
-    public void setEnterpriseRecruitTagService(EnterpriseRecruitTagService enterpriseRecruitTagService) {
-        this.enterpriseRecruitTagService = enterpriseRecruitTagService;
-    }
-
-    @Autowired
-    public void setJobDictionaryService(JobDictionaryService jobDictionaryService) {
-        this.jobDictionaryService = jobDictionaryService;
-    }
-    @Autowired
-    public void setSysAreaServiceApi(SysAreaServiceApi sysAreaServiceApi) {
-        this.sysAreaServiceApi = sysAreaServiceApi;
-    }
-
-    @Autowired
-    public void setPraciceSubmitRecordService(PraciceSubmitRecordService praciceSubmitRecordService) {
-        this.praciceSubmitRecordService = praciceSubmitRecordService;
-    }
-}

+ 0 - 246
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/EnterpriseServiceImpl.java

@@ -1,246 +0,0 @@
-package com.citupro.module.menduner.flames.serviceimpl;
-
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseSchoolPracticeListReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipEnterpriseDeptListVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseSchoolPracticeListVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipEnterpriseDeptVo;
-import com.citupro.module.menduner.flames.dal.mysql.Comment;
-import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
-import com.citupro.module.menduner.flames.dal.mysql.EnterpriseQualifications;
-import com.citupro.module.menduner.flames.dal.mysql.Student;
-import com.citupro.module.menduner.flames.enums.ErrorCodeConstants;
-import com.citupro.module.menduner.flames.mapper.EnterpriseMapper;
-import com.citupro.module.menduner.flames.mapper.EnterpriseQualificationsMapper;
-import com.citupro.module.menduner.flames.service.CommentService;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
-import com.citupro.module.menduner.flames.service.PraciceSubmitRecordService;
-import com.citupro.module.menduner.flames.service.StudentService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 
- *
- * @author code generator
- * @date 2023-06-06 09:56:21
- */
-@Service
-public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise>
-        implements EnterpriseService {
-
-    EnterpriseMapper enterpriseMapper;
-    EnterpriseQualificationsMapper enterpriseQualificationsMapper;
-
-    PraciceSubmitRecordService practiceSubmitRecordService;
-
-    StudentService studentService;
-
-    private CommentService commentService;
-
-
-    @Override
-    public List<Long> getInternshipStudentIdByEnterpriseId(Long enterpriseId) {
-        return practiceSubmitRecordService.getInternshipStudentIdByEnterpriseId(enterpriseId);
-    }
-
-    @Override
-    public CommonResult<Page<EnterpriseSchoolPracticeListVo>> getEnterpriseSchoolPracticeList(EnterpriseSchoolPracticeListReqVo enterpriseSchoolPracticeListReqVo) {
-       //  列出有本校学生正在参与实习的企业
-        LambdaQueryWrapper<Enterprise> queryWrapper =new LambdaQueryWrapper<Enterprise>();
-        queryWrapper.apply("enterprise_id  in  (SELECT student.enterprise_id FROM student , practice_submit_record  " +
-                " WHERE student.school_id = {0}  and student.student_id = practice_submit_record.student_id and practice_submit_record.`status` ='2')",
-                enterpriseSchoolPracticeListReqVo.getSchoolId());
-        // 查询指定学校的指定企业的在岗人数
-        // 查询企业实习评价
-        enterpriseMapper.selectPage(enterpriseSchoolPracticeListReqVo.getPage(),queryWrapper);
-        List<EnterpriseSchoolPracticeListVo> res =new ArrayList<>(enterpriseSchoolPracticeListReqVo.getPage().getRecords().size()+1);
-        Comment comment = new Comment();
-         comment.setType("学生-企业");
-        for (Object record : enterpriseSchoolPracticeListReqVo.getPage().getRecords()) {
-            EnterpriseSchoolPracticeListVo enterpriseSchoolPracticeListVo =new EnterpriseSchoolPracticeListVo();
-            Enterprise enterprise = (Enterprise) record;
-            enterpriseSchoolPracticeListVo.setEnterprise(enterprise);
-            enterpriseSchoolPracticeListVo.setCommon(commentService.commentAvgeStatistics(comment).getData());
-            // 填充正在实习的学生人数
-            enterpriseSchoolPracticeListVo.setStudentCount(enterpriseMapper.selectPracticeStudentCount(enterpriseSchoolPracticeListReqVo.getSchoolId(),enterprise.getEnterpriseId()));
-            res.add(enterpriseSchoolPracticeListVo);
-        }
-        enterpriseSchoolPracticeListReqVo.getPage().setRecords(res);
-        return CommonResult.success(enterpriseSchoolPracticeListReqVo.getPage());
-    }
-
-    @Override
-    public CommonResult<Page<StudentInternshipEnterpriseDeptVo>> studentInternshipEnterpriseDept(StudentInternshipEnterpriseDeptListVo studentInternshipEnterpriseDeptListVo) {
-        Page page = studentInternshipEnterpriseDeptListVo.getPage();
-        List<StudentInternshipEnterpriseDeptVo> datas =   enterpriseMapper.studentInternshipEnterpriseDept(studentInternshipEnterpriseDeptListVo.getPage(),studentInternshipEnterpriseDeptListVo);
-        Map<Long,StudentInternshipEnterpriseDeptVo> studentIds = datas.stream()
-                .collect(Collectors.toMap(StudentInternshipEnterpriseDeptVo::getStudentId,item->item));
-        List<Student> students =  studentService.getStudentByIds(studentIds.keySet());
-        students.forEach(item->studentIds.get(item.getStudentId()).setStudent(item));
-
-        page.setRecords(datas);
-        return CommonResult.success(page);
-    }
-
-    @Override
-    public CommonResult enterpriseWorkColud(Long schoolId) {
-        return commentService.enterpriseWorkColud(schoolId);
-    }
-
-    @Override
-    public void updateEnterpriseAgreeAuthStatus(Long entityId) {
-        enterpriseMapper.update(null,new LambdaUpdateWrapper<Enterprise>().eq(Enterprise::getEnterpriseId,entityId).set(Enterprise::getAuthStatus,"1"));
-    }
-
-    @Override
-    public void updateEnterpriseRefuseAuthStatus(Long entityId) {
-        enterpriseMapper.update(null,new LambdaUpdateWrapper<Enterprise>().eq(Enterprise::getEnterpriseId,entityId).set(Enterprise::getAuthStatus,"2"));
-
-    }
-
-
-
-
-    @Override
-    public CommonResult enterpriseList(Page page, Enterprise enterprise) {
-        String enterpriseName = enterprise.getEnterpriseName();
-        enterprise.setEnterpriseName(null);
-        enterprise.setTages(null);
-        enterprise.setPhotos(null);
-        LambdaQueryWrapper<Enterprise> queryWrapper =new LambdaQueryWrapper<Enterprise>(enterprise);
-        queryWrapper.like(StringUtils.isNotBlank(enterpriseName),Enterprise::getEnterpriseName,enterpriseName);
-        enterpriseMapper.selectPage(page,queryWrapper);
-        return CommonResult.success(page);
-    }
-
-    @Override
-    public CommonResult<EnterpriseInfoVo> enterpriseDetail(Long enterpriseId) {
-        Enterprise enterprise = enterpriseMapper.selectById(enterpriseId);
-        if (null == enterprise) {
-            return CommonResult.success(null);
-        }
-        return CommonResult.success(setEnterpriseInfo(enterprise));
-    }
-
-    @Override
-    public Enterprise getEnterpriseById(Long enterpriseId) {
-        if(null ==enterpriseId){
-            return null;
-        }
-        return enterpriseMapper.selectById(enterpriseId);
-    }
-
-
-
-    @Override
-    @Transactional
-    public CommonResult enterpriseRegister(EnterpriseInfoVo enterpriseInfoVo) {
-        EnterpriseInfoVo data = enterpriseInformation(enterpriseInfoVo.getEnterprise().getUserId()).getData();
-        if(null!=data && null!=data.getEnterprise()){
-            return CommonResult.error(ErrorCodeConstants.EXISTS_ENTERPRISE);
-        }
-        Enterprise enterprise = enterpriseInfoVo.getEnterprise();
-        EnterpriseQualifications enterpriseQualifications = enterpriseInfoVo.getEnterpriseQualifications();
-        enterprise.setEnterpriseId(IdUtil.getSnowflake(1L,1L).nextId());
-        enterpriseQualifications.setEnterpriseId(enterprise.getEnterpriseId());
-//        enterpriseQualifications.
-        enterpriseQualifications.setEnterpriseAplicationDate(LocalDateTime.now());
-        enterpriseQualifications.setEnterpriseApprovedDate(LocalDateTime.now());
-        enterprise.setAuthStatus("0");
-//        enterprise.setEnterpriseStatus("通过审核");
-        enterpriseMapper.insert(enterprise);
-        enterpriseQualificationsMapper.insert(enterpriseQualifications);
-
-        return CommonResult.success(enterpriseInfoVo);
-    }
-
-    @Override
-    public CommonResult enterpriseUpdate(EnterpriseInfoVo enterpriseInfoVo) {
-        Enterprise enterprise = enterpriseInfoVo.getEnterprise();
-        EnterpriseQualifications enterpriseQualifications = enterpriseInfoVo.getEnterpriseQualifications();
-        Enterprise dbEnterprise = enterpriseMapper.selectById(enterprise.getEnterpriseId());
-        if("1".equals(dbEnterprise.getAuthStatus())){
-            return CommonResult.success("企业已被审核不能在修改资料");
-        }
-        enterprise.setAuthStatus("0");
-        enterpriseMapper.updateById(enterprise);
-        enterpriseQualificationsMapper.updateById(enterpriseQualifications);
-        return CommonResult.success(enterpriseInfoVo);
-    }
-
-    @Override
-    public CommonResult enterpriseBasicUpdate(Enterprise enterprise) {
-
-        enterprise.setAuthStatus(null);
-        enterpriseMapper.updateById(enterprise);
-
-        return CommonResult.success(enterprise);
-    }
-
-
-    @Override
-    public CommonResult<EnterpriseInfoVo> enterpriseInformation(Long userId) {
-        Enterprise enterprise = enterpriseMapper.selectOne(new LambdaQueryWrapper<Enterprise>().eq(Enterprise::getUserId, userId));
-        if(null==enterprise){
-            return CommonResult.success(null);
-        }
-        return CommonResult.success(setEnterpriseInfo(enterprise));
-    }
-
-
-    private EnterpriseInfoVo setEnterpriseInfo(Enterprise enterprise){
-        EnterpriseInfoVo enterpriseInfoVo =new EnterpriseInfoVo();
-        if(null!=enterprise){
-            enterpriseInfoVo.setEnterprise(enterprise);
-            enterpriseInfoVo.setEnterpriseQualifications(enterpriseQualificationsMapper.selectById(enterprise.getEnterpriseId()));
-        }
-
-
-        return enterpriseInfoVo;
-    }
-    @Autowired
-    public void setStudentService(StudentService studentService) {
-        this.studentService = studentService;
-    }
-
-    @Autowired
-    @Lazy
-    public void setPracticeSubmitRecordService(PraciceSubmitRecordService practiceSubmitRecordService) {
-        this.practiceSubmitRecordService = practiceSubmitRecordService;
-    }
-
-    @Autowired
-    @Lazy
-    public void setEnterpriseQualificationsMapper(EnterpriseQualificationsMapper enterpriseQualificationsMapper) {
-        this.enterpriseQualificationsMapper = enterpriseQualificationsMapper;
-    }
-
-    @Autowired
-    public void setEnterpriseMapper(EnterpriseMapper enterpriseMapper) {
-        this.enterpriseMapper = enterpriseMapper;
-    }
-
-    @Autowired
-    @Lazy
-    public void setCommentService(CommentService commentService) {
-        this.commentService = commentService;
-    }
-}

+ 31 - 13
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/PraciceSubmitRecordServiceImpl.java

@@ -19,6 +19,8 @@ import com.citupro.module.menduner.flames.enums.ErrorCodeConstants;
 import com.citupro.module.menduner.flames.mapper.PraciceSubmitRecordMapper;
 import com.citupro.module.menduner.flames.service.*;
 import com.citupro.module.menduner.flames.service.api.WxAppletServiceApi;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +42,10 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(PraciceSubmitRecordServiceImpl.class);
     PraciceSubmitRecordMapper praciceSubmitRecordMapper;
     StudentService studentService;
-    EnterpriseService enterpriseService;
-    EnterpriseRecruitService enterpriseRecruitService;
+
+    EnterpriseProxyService  enterpriseService;
+    EnterpriseRecruitProxyService enterpriseRecruitService;
+
     StudentBiographicalNotesService studentBiographicalNotesService;
     WxAppletServiceApi wxAppletServiceApi;
 
@@ -69,17 +73,17 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
             return  CommonResult.error(ErrorCodeConstants.PRACICE_SUBMIT_RECORD_STUDENT_INTERNSHIP);
         }
         if (null == praciceSubmitRecord.getPracticeSubmitRecordId()) {
-            Enterprise enterprise = enterpriseService.getEnterpriseById(praciceSubmitRecord.getEnterpriseId());
-            Student student = studentService.getStudentById(praciceSubmitRecord.getStudentId());
+//            Enterprise enterprise = enterpriseService.getEnterpriseById(praciceSubmitRecord.getEnterpriseId());
+//            Student student = studentService.getStudentById(praciceSubmitRecord.getStudentId());
             // 给企业发送模板消息
             //
             if (Integer.valueOf(0).equals(praciceSubmitRecord.getStatus())) {
-                try {
-                    wxAppletServiceApi.wxappletSendTmpMsg(new WxappletSendTmpMsg().setAppType(appType).setMsgType(WxappletSendTmpMsg.APPROVAL_NOTICE_MSG_TYPE).setPage("pages/e-index/index").setUserId(enterprise.getUserId()).setParam(ImmutableMap.of("title", student.getStudentName(), "status", "投递简历", "sendDate", DateUtil.now())));
-                } catch (Exception e) {
-                    log.error("发送模板消息失败!");
-                    e.printStackTrace();
-                }
+//                try {
+//                    wxAppletServiceApi.wxappletSendTmpMsg(new WxappletSendTmpMsg().setAppType(appType).setMsgType(WxappletSendTmpMsg.APPROVAL_NOTICE_MSG_TYPE).setPage("pages/e-index/index").setUserId(enterprise.getUserId()).setParam(ImmutableMap.of("title", student.getStudentName(), "status", "投递简历", "sendDate", DateUtil.now())));
+//                } catch (Exception e) {
+//                    log.error("发送模板消息失败!");
+//                    e.printStackTrace();
+//                }
             }
             praciceSubmitRecordMapper.insert(praciceSubmitRecord);
         } else {
@@ -101,7 +105,7 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
             praciceSubmitRecordInfoVo.setStudentInfoVo(studentService.setStudentDetail(item.getStudentId()));
             praciceSubmitRecordInfoVo.setStudent(null != praciceSubmitRecordInfoVo.getStudentInfoVo() ? praciceSubmitRecordInfoVo.getStudentInfoVo().getStudent() : null);
 //            praciceSubmitRecordInfoVo.setEnterprise(enterpriseService.getEnterpriseById(item.getEnterpriseId()));
-//            praciceSubmitRecordInfoVo.setEnterpriseRecruit(enterpriseRecruitService.getEnterpriseRecruitById(item.getEnterpriseRecruitId()));
+            praciceSubmitRecordInfoVo.setEnterpriseRecruit(enterpriseRecruitService.getEnterpriseRecruitById(item.getEnterpriseRecruitId()));
             res.add(praciceSubmitRecordInfoVo);
         });
         page.setRecords(res);
@@ -148,6 +152,20 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
         return CommonResult.success(null);
     }
 
+    @Override
+    public List<Long> getInternshipEnterpriseBySchoolId(Long schoolId) {
+        return   praciceSubmitRecordMapper.selectList(new LambdaQueryWrapper<PraciceSubmitRecord>()
+                .select(PraciceSubmitRecord::getEnterpriseId)
+                .eq(PraciceSubmitRecord::getStatus,"2")
+                .apply("student_id  in (  select student_id from student where school_id = {0}  )",schoolId)
+        ).stream().map(item->item.getEnterpriseId()).collect(Collectors.toList());
+    }
+
+    @Override
+    public Integer selectPracticeStudentCount(Long schoolId, Long enterpriseId) {
+        return praciceSubmitRecordMapper.selectPracticeStudentCount(schoolId,enterpriseId);
+    }
+
 
     @Override
     public CommonResult praciceSubmitRecordEnterpriseCancel(Long practiceSubmitRecordId, Long enterpriseId, String refuseMsg) {
@@ -282,14 +300,14 @@ public class PraciceSubmitRecordServiceImpl extends ServiceImpl<PraciceSubmitRec
 
     @Autowired
     @Lazy
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 
 
     @Autowired
     @Lazy
-    public void setEnterpriseRecruitService(EnterpriseRecruitService enterpriseRecruitService) {
+    public void setEnterpriseRecruitService(EnterpriseRecruitProxyService enterpriseRecruitService) {
         this.enterpriseRecruitService = enterpriseRecruitService;
     }
 

+ 3 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnerpriseContractServiceImpl.java

@@ -3,17 +3,16 @@ package com.citupro.module.menduner.flames.serviceimpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citupro.module.menduner.flames.controller.base.vo.SchoolEnerpriseContractInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnerpriseContract;
 import com.citupro.module.menduner.flames.mapper.SchoolEnerpriseContractMapper;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
 import com.citupro.module.menduner.flames.service.SchoolEnerpriseContractService;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseChoiceActivityService;
 import com.citupro.module.menduner.flames.service.SchoolService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +33,7 @@ public class SchoolEnerpriseContractServiceImpl extends ServiceImpl<SchoolEnerpr
 
     SchoolService schoolService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     SchoolEnterpriseChoiceActivityService schoolEnterpriseChoiceActivityService;
 
@@ -137,7 +136,7 @@ public class SchoolEnerpriseContractServiceImpl extends ServiceImpl<SchoolEnerpr
     }
 
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 3 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseChoiceActivityJoinServiceImpl.java

@@ -14,6 +14,7 @@ import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseChoiceActivi
 import com.citupro.module.menduner.flames.mapper.SchoolEnterpriseChoiceActivityJoinMapper;
 import com.citupro.module.menduner.flames.service.*;
 import com.citupro.module.menduner.flames.service.api.WxAppletServiceApi;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Lazy;
@@ -42,7 +43,7 @@ public class SchoolEnterpriseChoiceActivityJoinServiceImpl
 
     SchoolService schoolService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     @Autowired
     WxAppletServiceApi wxAppletServiceApi;
@@ -200,7 +201,7 @@ public class SchoolEnterpriseChoiceActivityJoinServiceImpl
     }
     @Autowired
     @Lazy
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseChoiceActivityServiceImpl.java

@@ -11,10 +11,10 @@ import com.citupro.module.menduner.flames.controller.base.vo.SchoolEnterpriseCho
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseChoiceActivity;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseChoiceActivityJoin;
 import com.citupro.module.menduner.flames.mapper.SchoolEnerpriseChoiceActivityMapper;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseChoiceActivityJoinService;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseChoiceActivityService;
 import com.citupro.module.menduner.flames.service.SchoolService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,7 +36,7 @@ public class SchoolEnterpriseChoiceActivityServiceImpl extends ServiceImpl<Schoo
     @Autowired
     SchoolEnterpriseChoiceActivityJoinService schoolEnterpriseChoiceActivityJoinService;
     SchoolService schoolService;
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     @Override
     public CommonResult schoolEnerpriseChoiceActivitySave(SchoolEnterpriseChoiceActivity schoolEnterpriseChoiceActivity) {
@@ -108,7 +108,7 @@ public class SchoolEnterpriseChoiceActivityServiceImpl extends ServiceImpl<Schoo
         this.schoolService = schoolService;
     }
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/SchoolEnterpriseVisitorServiceImpl.java

@@ -14,10 +14,10 @@ import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseVisitor;
 import com.citupro.module.menduner.flames.mapper.SchoolEnterpriseVisitorMapper;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseVisitorService;
 import com.citupro.module.menduner.flames.service.SchoolService;
 import com.citupro.module.menduner.flames.service.api.WxAppletServiceApi;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,7 @@ public class SchoolEnterpriseVisitorServiceImpl extends ServiceImpl<SchoolEnterp
 
     SchoolService schoolService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     @Autowired
     WxAppletServiceApi wxAppletServiceApi;
@@ -226,7 +226,7 @@ public class SchoolEnterpriseVisitorServiceImpl extends ServiceImpl<SchoolEnterp
         this.schoolService = schoolService;
     }
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 6 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentInternshipCertificateServiceImpl.java

@@ -11,6 +11,8 @@ import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipCertificate
 import com.citupro.module.menduner.flames.enums.ErrorCodeConstants;
 import com.citupro.module.menduner.flames.mapper.StudentInternshipCertificateMapper;
 import com.citupro.module.menduner.flames.service.*;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,11 +32,11 @@ public class StudentInternshipCertificateServiceImpl extends
 
     StudentInternshipCertificateMapper studentInternshipCertificateMapper;
     StudentService studentService;
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     PraciceSubmitRecordService praciceSubmitRecordService;
 
-    EnterpriseRecruitService enterpriseRecruitService;
+    EnterpriseRecruitProxyService enterpriseRecruitService;
 
 
     @Override
@@ -92,7 +94,7 @@ public class StudentInternshipCertificateServiceImpl extends
         return  studentInternshipCertificateMapper.selectList(queryWrapper);
     }
     @Autowired
-    public void setEnterpriseRecruitService(EnterpriseRecruitService enterpriseRecruitService) {
+    public void setEnterpriseRecruitService(EnterpriseRecruitProxyService  enterpriseRecruitService) {
         this.enterpriseRecruitService = enterpriseRecruitService;
     }
 
@@ -106,7 +108,7 @@ public class StudentInternshipCertificateServiceImpl extends
         this.studentService = studentService;
     }
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 

+ 6 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentInternshipReportServiceImpl.java

@@ -10,6 +10,8 @@ import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipRe
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipReport;
 import com.citupro.module.menduner.flames.mapper.StudentInternshipReportMapper;
 import com.citupro.module.menduner.flames.service.*;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +35,9 @@ public class StudentInternshipReportServiceImpl
 
     StudentService studentService;
     SchoolService schoolService;
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
     SchoolClassService schoolClassService;
-    EnterpriseRecruitService enterpriseRecruitService;
+    EnterpriseRecruitProxyService enterpriseRecruitService;
     
 
     public CommonResult getStudentInternshipReportList(Page page, StudentInternshipReport studentInternshipReport
@@ -126,7 +128,7 @@ public class StudentInternshipReportServiceImpl
     }
 
     @Autowired
-    public void setEnterpriseRecruitService(EnterpriseRecruitService enterpriseRecruitService) {
+    public void setEnterpriseRecruitService(EnterpriseRecruitProxyService enterpriseRecruitService) {
         this.enterpriseRecruitService = enterpriseRecruitService;
     }
 
@@ -140,7 +142,7 @@ public class StudentInternshipReportServiceImpl
         }
 
     @Autowired
-    public void setEnterpriseService(EnterpriseService service){
+    public void setEnterpriseService(EnterpriseProxyService service){
         this.enterpriseService =service;
     }
     

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentRecommendationServiceImpl.java

@@ -6,9 +6,9 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citupro.module.menduner.flames.controller.base.vo.StudentRecommendationInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentRecommendation;
 import com.citupro.module.menduner.flames.mapper.StudentRecommendationMapper;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
 import com.citupro.module.menduner.flames.service.StudentRecommendationService;
 import com.citupro.module.menduner.flames.service.StudentService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,7 +29,7 @@ public class StudentRecommendationServiceImpl extends ServiceImpl<StudentRecomme
 
     StudentService studentService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
     public CommonResult getStudentRecommendationList(Page page, StudentRecommendation studentRecommendation){
         LambdaQueryWrapper<StudentRecommendation> queryWrapper =new LambdaQueryWrapper<>(studentRecommendation);
@@ -74,7 +74,7 @@ public class StudentRecommendationServiceImpl extends ServiceImpl<StudentRecomme
     }
 
     @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 }

+ 6 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/StudentServiceImpl.java

@@ -13,6 +13,8 @@ import com.citupro.module.menduner.flames.dal.mysql.*;
 import com.citupro.module.menduner.flames.enums.ErrorCodeConstants;
 import com.citupro.module.menduner.flames.mapper.StudentMapper;
 import com.citupro.module.menduner.flames.service.*;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +45,9 @@ public class StudentServiceImpl
 
     MajorService majorService;
 
-    EnterpriseService enterpriseService;
+    EnterpriseProxyService enterpriseService;
 
-    EnterpriseRecruitService enterpriseRecruitService;
+    EnterpriseRecruitProxyService enterpriseRecruitService;
 
     SchoolClassService schoolClassService;
 
@@ -273,14 +275,14 @@ public class StudentServiceImpl
 
     @Autowired
     @Lazy
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
+    public void setEnterpriseService(EnterpriseProxyService enterpriseService) {
         this.enterpriseService = enterpriseService;
     }
 
 
     @Autowired
     @Lazy
-    public void setEnterpriseRecruitService(EnterpriseRecruitService enterpriseRecruitService) {
+    public void setEnterpriseRecruitService(EnterpriseRecruitProxyService enterpriseRecruitService) {
         this.enterpriseRecruitService = enterpriseRecruitService;
     }
 

+ 17 - 23
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/UserAuthRecordServiceImpl.java

@@ -10,7 +10,6 @@ import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.UserAuthRecord;
 import com.citupro.module.menduner.flames.mapper.UserAuthRecordMapper;
-import com.citupro.module.menduner.flames.service.EnterpriseService;
 import com.citupro.module.menduner.flames.service.SchoolService;
 import com.citupro.module.menduner.flames.service.StudentService;
 import com.citupro.module.menduner.flames.service.UserAuthRecordService;
@@ -36,7 +35,6 @@ public class UserAuthRecordServiceImpl extends ServiceImpl<UserAuthRecordMapper,
 
     StudentService studentService;
 
-    EnterpriseService enterpriseService;
 
 
     SchoolService schoolService;
@@ -67,8 +65,7 @@ public class UserAuthRecordServiceImpl extends ServiceImpl<UserAuthRecordMapper,
 
 
     public CommonResult   userAuthRecordSave(UserAuthRecord userAuthRecord){
-        Enterprise enterprise = enterpriseService.getEnterpriseById(userAuthRecord.getEntityId());
-        School school = schoolService.getSchoolById(userAuthRecord.getEntityId());
+         School school = schoolService.getSchoolById(userAuthRecord.getEntityId());
         if(null == userAuthRecord.getUserAuthRecordId()){
                // 拒绝审核
                if(Integer.valueOf(0).equals(userAuthRecord.getStatus())) {
@@ -86,14 +83,14 @@ public class UserAuthRecordServiceImpl extends ServiceImpl<UserAuthRecordMapper,
                        );
 
                    } else {
-                       messageServiceApi.sendFlamesAuditMessage(new FlamesAuditMessageVo()
-                               .setPhone(enterprise.getPhone())
-                               .setTitle(enterprise.getEnterpriseName())
-                               .setStatus("审核被拒绝")
-                       );
-
-                       // 企业
-                       enterpriseService.updateEnterpriseRefuseAuthStatus(userAuthRecord.getEntityId());
+//                       messageServiceApi.sendFlamesAuditMessage(new FlamesAuditMessageVo()
+//                               .setPhone(enterprise.getPhone())
+//                               .setTitle(enterprise.getEnterpriseName())
+//                               .setStatus("审核被拒绝")
+//                       );
+//
+//                       // 企业
+//                       enterpriseService.updateEnterpriseRefuseAuthStatus(userAuthRecord.getEntityId());
                    }
                }else{
                      if(Integer.valueOf(0).equals(userAuthRecord.getUserType())){
@@ -110,13 +107,13 @@ public class UserAuthRecordServiceImpl extends ServiceImpl<UserAuthRecordMapper,
                          schoolService.updateSchoolAgreeAuthStatus(userAuthRecord.getEntityId());
 
                      } else {
-                         messageServiceApi.sendFlamesAuditMessage(new FlamesAuditMessageVo()
-                                 .setPhone(enterprise.getPhone())
-                                 .setTitle(enterprise.getEnterpriseName())
-                                 .setStatus("审核已通过")
-                         );
-                         // 企业
-                         enterpriseService.updateEnterpriseAgreeAuthStatus(userAuthRecord.getEntityId());
+//                         messageServiceApi.sendFlamesAuditMessage(new FlamesAuditMessageVo()
+//                                 .setPhone(enterprise.getPhone())
+//                                 .setTitle(enterprise.getEnterpriseName())
+//                                 .setStatus("审核已通过")
+//                         );
+//                         // 企业
+//                         enterpriseService.updateEnterpriseAgreeAuthStatus(userAuthRecord.getEntityId());
 
                      }
 
@@ -164,10 +161,7 @@ public class UserAuthRecordServiceImpl extends ServiceImpl<UserAuthRecordMapper,
         this.studentService = studentService;
     }
 
-    @Autowired
-    public void setEnterpriseService(EnterpriseService enterpriseService) {
-        this.enterpriseService = enterpriseService;
-    }
+
 
     @Autowired
     public void setSchoolService(SchoolService schoolService) {

+ 166 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/proxy/EnterpriseProxyServiceImpl.java

@@ -0,0 +1,166 @@
+package com.citupro.module.menduner.flames.serviceimpl.proxy;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.api.flames.enterprise.EnterpriseServiceApi;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseDetailRespVO;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseJobRespVO;
+import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseSchoolPracticeListReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipEnterpriseDeptListVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.EnterpriseVo;
+import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseInfoVo;
+import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseSchoolPracticeListVo;
+import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipEnterpriseDeptVo;
+import com.citupro.module.menduner.flames.convert.resp.EnterpriseConvert;
+import com.citupro.module.menduner.flames.dal.mysql.Comment;
+import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
+import com.citupro.module.menduner.flames.enums.ErrorCodeConstants;
+import com.citupro.module.menduner.flames.service.CommentService;
+import com.citupro.module.menduner.flames.service.PraciceSubmitRecordService;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseProxyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EnterpriseProxyServiceImpl implements EnterpriseProxyService {
+
+    EnterpriseServiceApi enterpriseServiceApi;
+
+
+     CommentService commentService;
+    PraciceSubmitRecordService practiceSubmitRecordService;
+
+    @Override
+    public CommonResult<Page<EnterpriseSchoolPracticeListVo>> getEnterpriseSchoolPracticeList(EnterpriseSchoolPracticeListReqVo enterpriseSchoolPracticeListReqVo) {
+
+        Page page = enterpriseSchoolPracticeListReqVo.getPage();
+
+        List<Long> enterpriseIds =   practiceSubmitRecordService
+              .getInternshipEnterpriseBySchoolId(enterpriseSchoolPracticeListReqVo.getSchoolId());
+
+        // 10
+        Long pageSize = page.getSize();
+        Long pages =   (enterpriseIds.size() %pageSize)==0 ? enterpriseIds.size() /pageSize: (enterpriseIds.size() /pageSize) +1;
+        Long startIndex = (page.getCurrent()-1) * pageSize;  // 0
+        Long endIndex = page.getCurrent() * pageSize; // 20/pracice/submit/record/list
+        endIndex = endIndex>enterpriseIds.size()?enterpriseIds.size():endIndex;
+        List<Long> pageEnterpriseIds = enterpriseIds.subList(startIndex.intValue(), endIndex.intValue());
+        List<AppFlamesEnterpriseDetailRespVO> data = enterpriseServiceApi.mendunerEnterpriseDetails(StringUtils.join(pageEnterpriseIds, ",")).getData();
+        List<EnterpriseSchoolPracticeListVo> res =new ArrayList<>();
+        Comment comment = new Comment();
+        comment.setType("学生-企业");
+        for (AppFlamesEnterpriseDetailRespVO datum : data) {
+            EnterpriseSchoolPracticeListVo enterpriseSchoolPracticeListVo =new EnterpriseSchoolPracticeListVo();
+            Enterprise enterprise = EnterpriseConvert.appEnterpriseDetailRespVOConvertEnterpriseInfoVo(datum).getEnterprise();
+            enterpriseSchoolPracticeListVo.setEnterprise(enterprise);
+            enterpriseSchoolPracticeListVo.setCommon(commentService.commentAvgeStatistics(comment).getData());
+            // 填充正在实习的学生人数
+            enterpriseSchoolPracticeListVo.setStudentCount(practiceSubmitRecordService.selectPracticeStudentCount(enterpriseSchoolPracticeListReqVo.getSchoolId(),enterprise.getEnterpriseId()));
+
+            res.add(enterpriseSchoolPracticeListVo);
+
+        }
+        page.setPages(Long.valueOf(pages));
+        page.setTotal(enterpriseIds.size());
+        enterpriseSchoolPracticeListReqVo.getPage().setRecords(res);
+        return CommonResult.success(enterpriseSchoolPracticeListReqVo.getPage());
+    }
+
+    @Override
+    public CommonResult<Page<StudentInternshipEnterpriseDeptVo>> studentInternshipEnterpriseDept(StudentInternshipEnterpriseDeptListVo studentInternshipEnterpriseDeptListVo) {
+        return CommonResult.error(ErrorCodeConstants.API_NOT_EXISTS_ERROR);
+    }
+
+    @Override
+    public CommonResult enterpriseList(Page page, Enterprise object) {
+//        AppEnterpriseSearchPageReqVO reqVo =new AppEnterpriseSearchPageReqVO();
+//        MendunerPageFill.fill(page,reqVo);
+//        reqVo.setName(object.getEnterpriseName());
+
+        PageResult<AppFlamesEnterpriseJobRespVO> data = enterpriseServiceApi.mendunerEnterpriseSearch(page.getCurrent(),page.getSize(),object.getEnterpriseName()).getData();
+        page.setTotal(data.getTotal());
+        List<EnterpriseVo> enterprises =new ArrayList<>();
+        for (AppFlamesEnterpriseJobRespVO appEnterpriseJobRespVO : data.getList()) {
+            // TODO 信息可能不足
+            enterprises.add(EnterpriseConvert.appEnterpriseJobRespVOConvertEnterpriseVo(appEnterpriseJobRespVO));
+        }
+        page.setRecords(enterprises);
+        return CommonResult.success(page);
+    }
+
+    @Override
+    public CommonResult<EnterpriseInfoVo> enterpriseDetail(Long enterpriseId) {
+        List<AppFlamesEnterpriseDetailRespVO> data = enterpriseServiceApi.mendunerEnterpriseDetails(enterpriseId.toString()).getData();
+        if(data.isEmpty()){
+            return CommonResult.success(null);
+        }
+        AppFlamesEnterpriseDetailRespVO appEnterpriseDetailRespVO = data.get(0);
+        return CommonResult.success(EnterpriseConvert.appEnterpriseDetailRespVOConvertEnterpriseInfoVo(appEnterpriseDetailRespVO));
+    }
+
+
+
+
+    @Override
+    public CommonResult enterpriseWorkColud(Long schoolId) {
+        return commentService.enterpriseWorkColud(schoolId);
+    }
+
+    @Override
+    public Map<Long, AppFlamesEnterpriseDetailRespVO> getEnterpriseList(List<Long> enterpriseIds) {
+        if(enterpriseIds.isEmpty()){
+            return new HashMap<>();
+        }
+        List<AppFlamesEnterpriseDetailRespVO> data = enterpriseServiceApi.mendunerEnterpriseDetails(StringUtils.join(enterpriseIds, ",")).getData();
+        if(data != null){
+            Map<Long, AppFlamesEnterpriseDetailRespVO> map = new HashMap<>();
+            data.forEach(item -> map.put(item.getEnterprise().getId(), item));
+            return map;
+        }
+
+        return new HashMap<>();
+    }
+
+    @Override
+    public Enterprise getEnterpriseById(Long enterpriseId) {
+        EnterpriseInfoVo data = enterpriseDetail(enterpriseId).getData();
+        if(null!=data){
+            return data.getEnterprise();
+        }
+        return null;
+    }
+
+    @Override
+    public Enterprise getById(Long enterpriseId) {
+        return getEnterpriseById(enterpriseId);
+    }
+
+
+    @Autowired
+    @Lazy
+    public void setCommentService(CommentService commentService) {
+        this.commentService = commentService;
+    }
+
+    @Autowired
+    public void setPracticeSubmitRecordService(PraciceSubmitRecordService practiceSubmitRecordService) {
+        this.practiceSubmitRecordService = practiceSubmitRecordService;
+    }
+
+
+
+    @Autowired
+    public void setEnterpriseServiceApi(EnterpriseServiceApi enterpriseServiceApi) {
+        this.enterpriseServiceApi = enterpriseServiceApi;
+    }
+
+}

+ 117 - 0
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/serviceimpl/proxy/EnterpriseRecruitProxyServiceImpl.java

@@ -0,0 +1,117 @@
+package com.citupro.module.menduner.flames.serviceimpl.proxy;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.EnterpriseRecruitServiceApi;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.reqvo.AppFlamesJobPageReqVo;
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlameJobRespVO;
+import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitInfoVo;
+import com.citupro.module.menduner.flames.convert.resp.EnterpriseConvert;
+import com.citupro.module.menduner.flames.convert.resp.EnterpriseRecruitConvert;
+import com.citupro.module.menduner.flames.convert.resp.EnterpriseRecruitTagConvertVo;
+import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
+import com.citupro.module.menduner.flames.service.proxy.EnterpriseRecruitProxyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class EnterpriseRecruitProxyServiceImpl implements EnterpriseRecruitProxyService {
+
+    EnterpriseRecruitServiceApi enterpriseRecruitServiceApi;
+
+
+
+
+    private AppFlamesJobPageReqVo fillAppFlamesJobPageReqVoParam(EnterpriseRecruitListReqVo enterpriseRecruitReqVo){
+        AppFlamesJobPageReqVo reqVo =new AppFlamesJobPageReqVo();
+        reqVo.setPageNo(enterpriseRecruitReqVo.getCurrent());
+        reqVo.setPageSize(enterpriseRecruitReqVo.getSize());
+        reqVo.setContent(enterpriseRecruitReqVo.getSearchKey());
+        // TODO 排序字段 orders
+        if(null != enterpriseRecruitReqVo.getEnterpriseRecruitId()) {
+            reqVo.setJobIds(    Arrays.asList(enterpriseRecruitReqVo.getEnterpriseRecruitId())) ;
+        }
+        reqVo.setEnterpriseId(enterpriseRecruitReqVo.getEnterpriseId());
+//        this.content  // TODO 岗位名称 和岗位描述暂不支持
+        reqVo.setEduType(enterpriseRecruitReqVo.getEduName());
+        reqVo.setAreaId(null==enterpriseRecruitReqVo.getWorkCityCode()?null:Long.valueOf(enterpriseRecruitReqVo.getWorkCityCode()));
+        reqVo.setJobFairId(enterpriseRecruitReqVo.getJobFairId());
+        return reqVo;
+    }
+
+
+    @Override
+    public CommonResult<Page<EnterpriseRecruitInfoVo>> getEnterpriseRecruitList(EnterpriseRecruitListReqVo enterpriseRecruitReqVo) {
+
+        PageResult<AppFlameJobRespVO> mendunerJobPageRespVo = enterpriseRecruitServiceApi
+                .mendunerJobPage(fillAppFlamesJobPageReqVoParam(enterpriseRecruitReqVo)).getData();
+        Page page =new Page();
+        List<EnterpriseRecruitInfoVo> resp =new ArrayList<>(mendunerJobPageRespVo.getList().size());
+        for (AppFlameJobRespVO item : mendunerJobPageRespVo.getList()) {
+            EnterpriseRecruitInfoVo infoVo  =new EnterpriseRecruitInfoVo();
+            infoVo.setEnterpriseRecruitTags(EnterpriseRecruitTagConvertVo.appFlameJobRespVOConvert(item));
+            infoVo.setEnterprise(EnterpriseConvert.appFlameJobRespVOConvertEnterpriseVo(item));
+            infoVo.setEnterpriseRecruit(EnterpriseRecruitConvert.enterpriseRecruitConvertEnterpriseRecruit(item));
+            resp.add(infoVo);
+        }
+        page.setRecords(resp);
+        page.setTotal(mendunerJobPageRespVo.getTotal());
+        page.setCurrent(enterpriseRecruitReqVo.getCurrent());
+        page.setSize(enterpriseRecruitReqVo.getSize());
+        return CommonResult.success(page);
+    }
+
+    @Override
+    public EnterpriseRecruit getEnterriseRecruitById(Long enterpriseRecruitId) {
+        AppFlamesJobPageReqVo reqVo =new AppFlamesJobPageReqVo();
+        reqVo.setJobIds(Arrays.asList(enterpriseRecruitId));
+        CommonResult<PageResult<AppFlameJobRespVO>> pageResultCommonResult = enterpriseRecruitServiceApi.mendunerJobPage(reqVo);
+        PageResult<AppFlameJobRespVO> mendunerJobPageRespVo = pageResultCommonResult.getData();
+        List<EnterpriseRecruitInfoVo> resp =new ArrayList<>(mendunerJobPageRespVo.getList().size());
+        for (AppFlameJobRespVO item : mendunerJobPageRespVo.getList()) {
+            EnterpriseRecruitInfoVo infoVo  =new EnterpriseRecruitInfoVo();
+            infoVo.setEnterpriseRecruitTags(EnterpriseRecruitTagConvertVo.appFlameJobRespVOConvert(item));
+            infoVo.setEnterprise(EnterpriseConvert.appFlameJobRespVOConvertEnterpriseVo(item));
+            infoVo.setEnterpriseRecruit(EnterpriseRecruitConvert.enterpriseRecruitConvertEnterpriseRecruit(item));
+            resp.add(infoVo);
+        }
+        if(resp.isEmpty()){
+            return null;
+        }
+        return resp.get(0).getEnterpriseRecruit();
+    }
+
+    @Override
+    public void updateSort(Long enterpriseRecruitId) {
+        //todo待实现
+    }
+
+    @Override
+    public  Map<Long, AppFlameJobRespVO> getEnterpriseRecruitByIds(List<Long> enterpriseRecruitId) {
+        AppFlamesJobPageReqVo reqVo =new AppFlamesJobPageReqVo();
+        reqVo.setJobIds(enterpriseRecruitId);
+        PageResult<AppFlameJobRespVO> mendunerJobPageRespVo = enterpriseRecruitServiceApi.mendunerJobPage(reqVo).getData();
+        return  mendunerJobPageRespVo.getList().stream().collect(Collectors.toMap(item->item.getJob().getId(),item->item));
+    }
+
+    @Override
+    public EnterpriseRecruit getEnterpriseRecruitById(Long enterpriseRecruitId) {
+        return getEnterriseRecruitById(enterpriseRecruitId);
+    }
+
+
+    @Autowired
+    public void setEnterpriseRecruitServiceApi(EnterpriseRecruitServiceApi enterpriseRecruitServiceApi) {
+        this.enterpriseRecruitServiceApi = enterpriseRecruitServiceApi;
+    }
+
+}

+ 5 - 5
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/EnterpriseServiceApi.java

@@ -2,8 +2,8 @@ package com.citu.module.menduner.system.api.flames.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppEnterpriseJobRespVO;
 import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseDetailRespVO;
+import com.citu.module.menduner.system.api.flames.enterprise.respvo.AppFlamesEnterpriseJobRespVO;
 import com.citu.module.menduner.system.enums.ApiConstants;
 
 import org.springframework.cloud.openfeign.FeignClient;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "enterpriseServiceApi",value = ApiConstants.NAME)
+@FeignClient(value =  ApiConstants.NAME)
 public interface EnterpriseServiceApi {
 
 
@@ -31,8 +31,8 @@ public interface EnterpriseServiceApi {
      * @return
      */
     @GetMapping("/app-api/menduner/system/enterprise/search")
-    public CommonResult<PageResult<AppEnterpriseJobRespVO>> mendunerEnterpriseSearch(@RequestParam("pageNo")Long pageNo,
-                                                                                     @RequestParam("pageSize")Long  pageSize,
-                                                                                     @RequestParam("name")String name);
+    public CommonResult<PageResult<AppFlamesEnterpriseJobRespVO>> mendunerEnterpriseSearch(@RequestParam("pageNo")Long pageNo,
+                                                                                           @RequestParam("pageSize")Long  pageSize,
+                                                                                           @RequestParam("name")String name);
 
 }

+ 2 - 1
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/EnterpriseRecruitServiceApi.java

@@ -12,9 +12,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import javax.validation.Valid;
 
-@FeignClient(name = "enterpriseRecruitServiceApi",value = ApiConstants.NAME)
+@FeignClient(contextId="enterpriseRecruitServiceApi",value =  ApiConstants.NAME )
 public interface EnterpriseRecruitServiceApi {
 
+
     @PostMapping("/app-api/menduner/system/flame-job/page")
     public  CommonResult<PageResult<AppFlameJobRespVO>> mendunerJobPage(@Valid AppFlamesJobPageReqVo reqVO);
 }

+ 31 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/respvo/AppFlameJobRespVO.java

@@ -26,4 +26,35 @@ public class AppFlameJobRespVO {
      */
     private AppFlamesEnterpriseBusinessRespVO business;
 
+    public AppFlamesJobRespVo getJob() {
+        return job;
+    }
+
+    public void setJob(AppFlamesJobRespVo job) {
+        this.job = job;
+    }
+
+    public AppFlamesJobExtendRespVo getJobExtend() {
+        return jobExtend;
+    }
+
+    public void setJobExtend(AppFlamesJobExtendRespVo jobExtend) {
+        this.jobExtend = jobExtend;
+    }
+
+    public AppFlamesEnterpriseRespVo getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(AppFlamesEnterpriseRespVo enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public AppFlamesEnterpriseBusinessRespVO getBusiness() {
+        return business;
+    }
+
+    public void setBusiness(AppFlamesEnterpriseBusinessRespVO business) {
+        this.business = business;
+    }
 }

+ 23 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/recruit/respvo/AppFlamesJobRespVo.java

@@ -1,5 +1,7 @@
 package com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -43,6 +45,27 @@ public class AppFlamesJobRespVo {
 
      private String positionName;
 
+    // 工作经验
+    private String type;
+
+    private String address;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     public Long getId() {
         return id;
     }

+ 0 - 23
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppEnterpriseJobRespVO.java

@@ -1,23 +0,0 @@
-package com.citu.module.menduner.system.api.flames.enterprise.respvo;
-
-public class AppEnterpriseJobRespVO {
-
-    /**
-     * 企业信息
-     */
-
-    private EnterpriseBaseSimpleRespVO enterprise;
-
-// 暂不需要
-//    @Schema(description = "企业发布职位", example = "{}")
-//    private List<AppJobAdvertisedSimpleRespVO> jobList;
-
-
-    public EnterpriseBaseSimpleRespVO getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(EnterpriseBaseSimpleRespVO enterprise) {
-        this.enterprise = enterprise;
-    }
-}

+ 0 - 197
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseBusinessRespVO.java

@@ -1,197 +0,0 @@
-package com.citu.module.menduner.system.api.flames.enterprise.respvo;
-
-import java.time.LocalDateTime;
-
-public class AppFlamesEnterpriseBusinessRespVO {
-
-
-    private Long id;
-
-    private Long enterpriseId;
-
-    private String code;
-
-    private String name;
-
-    private String type;
-
-    private String area;
-
-    private String address;
-
-    private String representative;
-
-    private LocalDateTime establishmentTime;
-
-    private String registeredCapital;
-
-    private String approvalTime;
-
-    private String formerName;
-
-    private String industry;
-
-    private String registrationAuthority;
-
-    private String businessStatus;
-
-    private String businessTerm;
-
-    private String businessScope;
-
-    private String businessUrl;
-
-    private LocalDateTime createTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getArea() {
-        return area;
-    }
-
-    public void setArea(String area) {
-        this.area = area;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getRepresentative() {
-        return representative;
-    }
-
-    public void setRepresentative(String representative) {
-        this.representative = representative;
-    }
-
-    public LocalDateTime getEstablishmentTime() {
-        return establishmentTime;
-    }
-
-    public void setEstablishmentTime(LocalDateTime establishmentTime) {
-        this.establishmentTime = establishmentTime;
-    }
-
-    public String getRegisteredCapital() {
-        return registeredCapital;
-    }
-
-    public void setRegisteredCapital(String registeredCapital) {
-        this.registeredCapital = registeredCapital;
-    }
-
-    public String getApprovalTime() {
-        return approvalTime;
-    }
-
-    public void setApprovalTime(String approvalTime) {
-        this.approvalTime = approvalTime;
-    }
-
-    public String getFormerName() {
-        return formerName;
-    }
-
-    public void setFormerName(String formerName) {
-        this.formerName = formerName;
-    }
-
-    public String getIndustry() {
-        return industry;
-    }
-
-    public void setIndustry(String industry) {
-        this.industry = industry;
-    }
-
-    public String getRegistrationAuthority() {
-        return registrationAuthority;
-    }
-
-    public void setRegistrationAuthority(String registrationAuthority) {
-        this.registrationAuthority = registrationAuthority;
-    }
-
-    public String getBusinessStatus() {
-        return businessStatus;
-    }
-
-    public void setBusinessStatus(String businessStatus) {
-        this.businessStatus = businessStatus;
-    }
-
-    public String getBusinessTerm() {
-        return businessTerm;
-    }
-
-    public void setBusinessTerm(String businessTerm) {
-        this.businessTerm = businessTerm;
-    }
-
-    public String getBusinessScope() {
-        return businessScope;
-    }
-
-    public void setBusinessScope(String businessScope) {
-        this.businessScope = businessScope;
-    }
-
-    public String getBusinessUrl() {
-        return businessUrl;
-    }
-
-    public void setBusinessUrl(String businessUrl) {
-        this.businessUrl = businessUrl;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-}

+ 5 - 3
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseDetailRespVO.java

@@ -1,5 +1,7 @@
 package com.citu.module.menduner.system.api.flames.enterprise.respvo;
 
+import com.citu.module.menduner.system.api.flames.enterprise.recruit.respvo.AppFlamesEnterpriseBusinessRespVO;
+
 import java.util.List;
 
 /**
@@ -10,7 +12,7 @@ public class AppFlamesEnterpriseDetailRespVO {
      /**
      * 企业基本信息
      */
-    private AppFlamesEnterpriseRespVO enterprise;
+    private AppFlamesEnterpriseRespVo enterprise;
 
 
     /**
@@ -24,11 +26,11 @@ public class AppFlamesEnterpriseDetailRespVO {
      */
     private List<AppFlamesEnterpriseAddressRespVO> addressList;
 
-    public AppFlamesEnterpriseRespVO getEnterprise() {
+    public AppFlamesEnterpriseRespVo getEnterprise() {
         return enterprise;
     }
 
-    public void setEnterprise(AppFlamesEnterpriseRespVO enterprise) {
+    public void setEnterprise(AppFlamesEnterpriseRespVo enterprise) {
         this.enterprise = enterprise;
     }
 

+ 0 - 360
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseRespVO.java

@@ -1,360 +0,0 @@
-package com.citu.module.menduner.system.api.flames.enterprise.respvo;
-
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 企业信息
- */
-public class AppFlamesEnterpriseRespVO {
-    private Long id;
-
-
-    /**
-     * 上级id
-     */
-    private Long parentId;
-
-
-
-    /**
-     * 企业全称
-     */
-    private String name;
-
-
-
-
-    /**
-     * 企业别称
-     */
-    private String anotherName;
-
-
-    /**
-     * 企业官网
-     */
-
-    private String website;
-
-
-
-    /**
-     * 企业简介
-     */
-
-    private String introduce;
-
-
-
-    /**
-     * 联系人
-     */
-
-    private String contact;
-
-
-
-    /**
-     * 联系电话
-     */
-
-    private String phone;
-
-
-
-    /**
-     * https://www.iocoder.cn
-     */
-
-    private String logoUrl;
-
-
-
-    /**
-     * 所在行业Id
-     */
-    private Long industryId;
-
-
-    /**
-     * 融资阶段(未融资,天使轮,A轮,B轮,C轮,D轮以上,已上市,不需要融资)
-     */
-    private String financingStatus;
-
-    /**
-     * 人员规模(0-20人,20-99人,100-499人,500-999人,1000-9999人,9999人以上)
-     */
-
-    private String scale;
-
-
-    /**
-     * 企业福利
-     */
-    private List<String> welfareList;
-
-
-
-    /**
-     * 企业标签
-     */
-
-    private List<String> tagList;
-
-
-    /**
-     * 企业相册
-     */
-
-    private List<String> albumList;
-
-
-
-    /**
-     * 上班时间
-     */
-
-    private String workTime;
-
-    /**
-     * 发展历程
-     */
-
-    private String developHistory;
-
-    /**
-     * 获得荣誉
-     */
-    private String receivedHonors;
-
-
-    /**
-     * 开业时间
-     */
-    private LocalDateTime openTime;
-
-
-
-    /**
-     * 是否筹备
-     */
-    private Boolean prepare;
-
-
-
-    /**
-     * 允许企业发布哪些职位类型
-     */
-    private List<String> pubJobTypePerm;
-
-
-    /**
-     * 状态(0正常 1停用)
-     */
-    private String status;
-
-
-    /**
-     * 创建时间
-     */
-
-    private LocalDateTime createTime;
-
-
-
-    private LocalDateTime updateTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAnotherName() {
-        return anotherName;
-    }
-
-    public void setAnotherName(String anotherName) {
-        this.anotherName = anotherName;
-    }
-
-    public String getWebsite() {
-        return website;
-    }
-
-    public void setWebsite(String website) {
-        this.website = website;
-    }
-
-    public String getIntroduce() {
-        return introduce;
-    }
-
-    public void setIntroduce(String introduce) {
-        this.introduce = introduce;
-    }
-
-    public String getContact() {
-        return contact;
-    }
-
-    public void setContact(String contact) {
-        this.contact = contact;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getLogoUrl() {
-        return logoUrl;
-    }
-
-    public void setLogoUrl(String logoUrl) {
-        this.logoUrl = logoUrl;
-    }
-
-    public Long getIndustryId() {
-        return industryId;
-    }
-
-    public void setIndustryId(Long industryId) {
-        this.industryId = industryId;
-    }
-
-    public String getFinancingStatus() {
-        return financingStatus;
-    }
-
-    public void setFinancingStatus(String financingStatus) {
-        this.financingStatus = financingStatus;
-    }
-
-    public String getScale() {
-        return scale;
-    }
-
-    public void setScale(String scale) {
-        this.scale = scale;
-    }
-
-    public List<String> getWelfareList() {
-        return welfareList;
-    }
-
-    public void setWelfareList(List<String> welfareList) {
-        this.welfareList = welfareList;
-    }
-
-    public List<String> getTagList() {
-        return tagList;
-    }
-
-    public void setTagList(List<String> tagList) {
-        this.tagList = tagList;
-    }
-
-    public List<String> getAlbumList() {
-        return albumList;
-    }
-
-    public void setAlbumList(List<String> albumList) {
-        this.albumList = albumList;
-    }
-
-    public String getWorkTime() {
-        return workTime;
-    }
-
-    public void setWorkTime(String workTime) {
-        this.workTime = workTime;
-    }
-
-    public String getDevelopHistory() {
-        return developHistory;
-    }
-
-    public void setDevelopHistory(String developHistory) {
-        this.developHistory = developHistory;
-    }
-
-    public String getReceivedHonors() {
-        return receivedHonors;
-    }
-
-    public void setReceivedHonors(String receivedHonors) {
-        this.receivedHonors = receivedHonors;
-    }
-
-    public LocalDateTime getOpenTime() {
-        return openTime;
-    }
-
-    public void setOpenTime(LocalDateTime openTime) {
-        this.openTime = openTime;
-    }
-
-    public Boolean getPrepare() {
-        return prepare;
-    }
-
-    public void setPrepare(Boolean prepare) {
-        this.prepare = prepare;
-    }
-
-    public List<String> getPubJobTypePerm() {
-        return pubJobTypePerm;
-    }
-
-    public void setPubJobTypePerm(List<String> pubJobTypePerm) {
-        this.pubJobTypePerm = pubJobTypePerm;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-
-    public LocalDateTime getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(LocalDateTime updateTime) {
-        this.updateTime = updateTime;
-    }
-}

+ 1 - 1
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseVo.java → menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/enterprise/respvo/AppFlamesEnterpriseRespVo.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.api.flames.enterprise.respvo;
 import java.time.LocalDateTime;
 import java.util.List;
 
-public class AppFlamesEnterpriseVo {
+public class AppFlamesEnterpriseRespVo {
 
 
 

+ 2 - 1
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/flames/job/fair/JobFairServiceApi.java

@@ -2,12 +2,13 @@ package com.citu.module.menduner.system.api.flames.job.fair;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.module.menduner.system.api.flames.job.fair.respvo.JobFairRespVO;
+import com.citu.module.menduner.system.enums.ApiConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
 
-@FeignClient(name = "jobFairServiceApi",url = "${menduner.url:192.168.3.80}")
+@FeignClient(value = ApiConstants.NAME)
 public interface JobFairServiceApi {
 
     @GetMapping("/app-api/menduner/system/job-fair/list")