Jelajahi Sumber

Merge branch 'refs/heads/develop_zqc' into develop_rayson

rayson 1 tahun lalu
induk
melakukan
a8236fa768
100 mengubah file dengan 565 tambahan dan 675 penghapusan
  1. 1 0
      menduner/menduner-flames-api/src/main/java/com/citupro/module/menduner/flames/enums/ErrorCodeConstants.java
  2. 13 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. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/CommentAnalysisController.java
  8. 0 214
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseController.java
  9. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseHotspotsController.java
  10. 0 122
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseRecruitController.java
  11. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseRecruitPlanController.java
  12. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseRecruitTagController.java
  13. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/FeedbackController.java
  14. 1 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/JobDictionaryController.java
  15. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/PraciceSubmitRecordController.java
  16. 2 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolClassController.java
  17. 2 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolController.java
  18. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolDepartmentController.java
  19. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolEnterpriseVisitorController.java
  20. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolStatisticsController.java
  21. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentExperienceController.java
  22. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentInternshipCertificateController.java
  23. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentInternshipReportController.java
  24. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentJobIntentionController.java
  25. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentLanguageController.java
  26. 2 2
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentRecommendationController.java
  27. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudnetAwardExperienceController.java
  28. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudnetSampleController.java
  29. 3 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/UserAuthRecordController.java
  30. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/base/BaseStatisticsReqVo.java
  31. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/base/GraphDataReqVo.java
  32. 2 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EmployeeBusinessMachineStatisticsReqVo.java
  33. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseHotspotsIdReqVo.java
  34. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseHotspotsListReqVo.java
  35. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseSchoolPracticeListReqVo.java
  36. 320 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseVo.java
  37. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EenterpriseRecruitSaveReqVo.java
  38. 8 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitListReqVo.java
  39. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitPlanIdReqVo.java
  40. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitPlanListReqVo.java
  41. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitTagIdReqVo.java
  42. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitTagListReqVo.java
  43. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/pracice_submit_record/PraciceSubmitRecordIdReqVo.java
  44. 4 4
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/pracice_submit_record/PraciceSubmitRecordListReqVO.java
  45. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolClassListReqVo.java
  46. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolDepartmentIdReqVo.java
  47. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolDepartmentListReqVo.java
  48. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolEnterpriseVisitorRecordExists.java
  49. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolOrganizationReqVo.java
  50. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolStudentInternshipReqVO.java
  51. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentExperienceIdReqVo.java
  52. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentExperienceListReqVo.java
  53. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipEnterpriseDeptListVo.java
  54. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipReportIdReqVo.java
  55. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipReportListReqVo.java
  56. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentJobIntentionIdReqVo.java
  57. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentJobIntentionListReqVo.java
  58. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentLanguageIdReqVo.java
  59. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentLanguageListReqVo.java
  60. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentRecommendationListReqVo.java
  61. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetAwardExperienceIdReqVo.java
  62. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetAwardExperienceListReqVo.java
  63. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetSampleIdReqVo.java
  64. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetSampleListReqVo.java
  65. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/feedback/FeedbackIdReqVo.java
  66. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/feedback/FeedbackListReqVo.java
  67. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/user/auth/UserAuthRecordIdReqVo.java
  68. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/user/auth/UserAuthRecordListReqVo.java
  69. 1 0
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/PraciceSubmitRecordInfoVo.java
  70. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/CommentAnalysisInfoVo.java
  71. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/EnterpriseHotspotsInfoVo.java
  72. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/EnterpriseInfoVo.java
  73. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/EnterpriseSchoolPracticeListVo.java
  74. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitExcelVo.java
  75. 2 3
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitInfoVo.java
  76. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitPlanInfoVo.java
  77. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitTagInfoVo.java
  78. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolClassInfoVo.java
  79. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolDepartmentInfoVo.java
  80. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnerpriseContractInfoVo.java
  81. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnterpriseChoiceActivityInfoVo.java
  82. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnterpriseChoiceActivityJoinInfoVo.java
  83. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnterpriseContractInfoVo.java
  84. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnterpriseStatisticsDetail.java
  85. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolEnterpriseVisitorInfoVo.java
  86. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolInfoVo.java
  87. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/school/SchoolInternshipReportDetailVo.java
  88. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentExperienceInfoVo.java
  89. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentInfoVo.java
  90. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentInternshipCertificateInfoVo.java
  91. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentInternshipEnterpriseDeptVo.java
  92. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentInternshipReportInfoVo.java
  93. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentJobIntentionInfoVo.java
  94. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentLanguageInfoVo.java
  95. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudentRecommendationInfoVo.java
  96. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudnetAwardExperienceInfoVo.java
  97. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/student/StudnetSampleInfoVo.java
  98. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/system/AdvertisementMessageInfoVo.java
  99. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/system/CommentInfoVo.java
  100. 1 1
      menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/system/FeedbackInfoVo.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 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, "企业已存在");
     ErrorCode EXISTS_ENTERPRISE = new ErrorCode(1_130_001_001, "企业已存在");

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

@@ -28,6 +28,13 @@
             <version>${revision}</version>
             <version>${revision}</version>
         </dependency>
         </dependency>
 
 
+        <!-- 依赖服务 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>menduner-system-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
 
 
         <!-- Registry 注册中心相关 -->
         <!-- Registry 注册中心相关 -->
         <dependency>
         <dependency>
@@ -90,6 +97,12 @@
             <groupId>ch.qos.logback</groupId>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
             <artifactId>logback-core</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>menduner-system-api</artifactId>
+            <version>2.2.0-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
 
 
 
 
     </dependencies>
     </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;
-    }
-}

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/CommentAnalysisController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citupro.module.menduner.flames.controller.base.reqvo.CommentAnalysisIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.CommentAnalysisIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.CommentAnalysisListReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.CommentAnalysisListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.CommentAnalysisInfoVo;
+import com.citupro.module.menduner.flames.controller.base.vo.enterprise.CommentAnalysisInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.CommentAnalysis;
 import com.citupro.module.menduner.flames.dal.mysql.CommentAnalysis;
 import com.citupro.module.menduner.flames.service.CommentAnalysisService;
 import com.citupro.module.menduner.flames.service.CommentAnalysisService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 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()));
-    }
-}

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseHotspotsController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseHotspotsIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseHotspotsListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseHotspotsInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.EnterpriseHotspotsIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.EnterpriseHotspotsListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.enterprise.EnterpriseHotspotsInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;
 import com.citupro.module.menduner.flames.service.EnterpriseHotspotsService;
 import com.citupro.module.menduner.flames.service.EnterpriseHotspotsService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,122 +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.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.reqvo.enterprise.EnterpriseRecruitSaveReqVo;
-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.service.EnterpriseRecruitService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-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 EnterpriseRecruitController   {
-    @SuppressWarnings("all")
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(EnterpriseRecruitController.class);
-    @Autowired
-    private EnterpriseRecruitService enterpriseRecruitService;
-
-    /**
-     * @param file 文件
-     * @param enterpriseId 企业Id
-     * @return R
-     * @eo.name 批量上传企业岗位
-     * @eo.url /enterprise/recruit/upload
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/recruit/upload")
-    public CommonResult enterpriseRecruitUpload(@RequestParam("file") MultipartFile file, @RequestParam("enterpriseId") Long enterpriseId) throws IOException {
-        return enterpriseRecruitService.enterpriseRecruitUpload(file.getInputStream(), file.getOriginalFilename(), enterpriseId);
-    }
-
-    /**
-     * @param enterpriseRecruit
-     * @return R
-     * @eo.name 列表企业招聘岗位
-     * @eo.url /enterprise/recruit/list
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/recruit/list")
-    public CommonResult<Page<EnterpriseRecruitInfoVo>> getEnterpriseRecruitList(@RequestBody EnterpriseRecruitListReqVo enterpriseRecruit) {
-        return enterpriseRecruitService.getEnterpriseRecruitList(enterpriseRecruit);
-    }
-
-    /**
-     * 通过id查询
-     * @param enterpriseRecruitId
-     * @return R
-     */
-    @PostMapping("/enterpriserecruit/detail")
-    public CommonResult getById(@RequestBody Map reqVo) {
-
-        return CommonResult.success(enterpriseRecruitService.getById( Long.valueOf(reqVo.getOrDefault("enterpriseRecruitId", "0").toString())));
-    }
-
-    /**
-     * 保存职位
-     * @param enterpriseRecruit 
-     * @return R
-     */
-    @PostMapping("/enterprise/recruit/save")
-    public CommonResult save(@RequestBody EnterpriseRecruitSaveReqVo reqVo) {
-        return enterpriseRecruitService.enterpriseRecruitSave(reqVo, reqVo.getTags());
-    }
-
-    /**
-     * @param enterpriseRecruits
-     * @return R
-     * @eo.name 批量保存岗位
-     * @eo.url /enterprise/recruit/save/all
-     * @eo.method post
-     * @eo.request-type json
-     */
-    @PostMapping("/enterprise/recruit/save/all")
-    public CommonResult enterpriseRecruitSaveAll(@RequestBody List<EenterpriseRecruitSaveReqVo> enterpriseRecruits) {
-        return enterpriseRecruitService.enterpriseRecruitSaveAll(enterpriseRecruits);
-    }
-
-    /**
-     * 修改
-     * @param enterpriseRecruit 
-     * @return R
-     */
-    @PostMapping("/enterpriserecruit/update")
-    public CommonResult updateById(@RequestBody EnterpriseRecruit enterpriseRecruit) {
-        return CommonResult.success(enterpriseRecruitService.updateById(enterpriseRecruit));
-    }
-
-    /**
-     * 通过id删除
-     * @param enterpriseRecruitId
-     * @return R
-     */
-    @PostMapping("/enterpriserecruit/del")
-    public CommonResult removeById(Long enterpriseRecruitId) {
-        /**
-                  UpdateWrapper updateWrapper  =new UpdateWrapper();
-                     updateWrapper.eq("id",id);
-                     updateWrapper.set("del",1);
-                     enterpriseRecruitService.update(updateWrapper);
-            **/
-        return CommonResult.success(enterpriseRecruitService.removeById(enterpriseRecruitId));
-    }
-}

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseRecruitPlanController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitPlanIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitPlanListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitPlanInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit.EnterpriseRecruitPlanIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit.EnterpriseRecruitPlanListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit.EnterpriseRecruitPlanInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitPlan;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitPlan;
 import com.citupro.module.menduner.flames.service.EnterpriseRecruitPlanService;
 import com.citupro.module.menduner.flames.service.EnterpriseRecruitPlanService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/EnterpriseRecruitTagController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitTagIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.EnterpriseRecruitTagListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.EnterpriseRecruitTagInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit.EnterpriseRecruitTagIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit.EnterpriseRecruitTagListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit.EnterpriseRecruitTagInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
 import com.citupro.module.menduner.flames.service.EnterpriseRecruitTagService;
 import com.citupro.module.menduner.flames.service.EnterpriseRecruitTagService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/FeedbackController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.FeedbackIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.FeedbackListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.FeedbackInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.system.feedback.FeedbackIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.system.feedback.FeedbackListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.system.FeedbackInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;
 import com.citupro.module.menduner.flames.service.FeedbackService;
 import com.citupro.module.menduner.flames.service.FeedbackService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/JobDictionaryController.java

@@ -4,8 +4,7 @@ package com.citupro.module.menduner.flames.controller.app;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.vo.JobDictionaryTreeVo;
-import com.citupro.module.menduner.flames.dal.mysql.IntroduceSetting;
+import com.citupro.module.menduner.flames.controller.base.vo.system.JobDictionaryTreeVo;
 import com.citupro.module.menduner.flames.dal.mysql.JobDictionary;
 import com.citupro.module.menduner.flames.dal.mysql.JobDictionary;
 import com.citupro.module.menduner.flames.service.JobDictionaryService;
 import com.citupro.module.menduner.flames.service.JobDictionaryService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/PraciceSubmitRecordController.java

@@ -2,7 +2,7 @@ package com.citupro.module.menduner.flames.controller.app;
 
 
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.PraciceSubmitRecordIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record.PraciceSubmitRecordIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record.PraciceSubmitRecordListReqVO;
 import com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record.PraciceSubmitRecordListReqVO;
 import com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record.PraciceSubmitRecordStudentInterviewReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record.PraciceSubmitRecordStudentInterviewReqVo;
 import com.citupro.module.menduner.flames.dal.mysql.PraciceSubmitRecord;
 import com.citupro.module.menduner.flames.dal.mysql.PraciceSubmitRecord;

+ 2 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolClassController.java

@@ -3,8 +3,8 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolClassListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolClassInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolClassListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.school.SchoolClassInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolClass;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolClass;
 import com.citupro.module.menduner.flames.service.SchoolClassService;
 import com.citupro.module.menduner.flames.service.SchoolClassService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 2 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolController.java

@@ -5,11 +5,10 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolOrganizationReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolOrganizationReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolStudentDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolStudentDetailReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolInfoVo;
-import com.citupro.module.menduner.flames.dal.mysql.News;
+import com.citupro.module.menduner.flames.controller.base.vo.school.SchoolInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.service.SchoolService;
 import com.citupro.module.menduner.flames.service.SchoolService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolDepartmentController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolDepartmentIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolDepartmentListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolDepartmentInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolDepartmentIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolDepartmentListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.school.SchoolDepartmentInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;
 import com.citupro.module.menduner.flames.service.SchoolDepartmentService;
 import com.citupro.module.menduner.flames.service.SchoolDepartmentService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolEnterpriseVisitorController.java

@@ -2,7 +2,7 @@ package com.citupro.module.menduner.flames.controller.app;
 
 
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolEnterpriseVisitorRecordExists;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolEnterpriseVisitorRecordExists;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseVisitor;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolEnterpriseVisitor;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseVisitorService;
 import com.citupro.module.menduner.flames.service.SchoolEnterpriseVisitorService;
 import com.citupro.module.menduner.flames.util.RequestParmterModel;
 import com.citupro.module.menduner.flames.util.RequestParmterModel;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/SchoolStatisticsController.java

@@ -3,13 +3,13 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.SchoolStudentInternshipReqVO;
+import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolStudentInternshipReqVO;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.SchoolIdReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolEnterpriseDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolEnterpriseDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolInternshipReportDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolInternshipReportDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolInternshipStatusDetailReqVo;
 import com.citupro.module.menduner.flames.controller.base.reqvo.school.statistics.SchoolInternshipStatusDetailReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolEnterpriseStatisticsDetail;
-import com.citupro.module.menduner.flames.controller.base.vo.SchoolInternshipReportDetailVo;
+import com.citupro.module.menduner.flames.controller.base.vo.school.SchoolEnterpriseStatisticsDetail;
+import com.citupro.module.menduner.flames.controller.base.vo.school.SchoolInternshipReportDetailVo;
 import com.citupro.module.menduner.flames.service.SchoolStatisticsService;
 import com.citupro.module.menduner.flames.service.SchoolStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentExperienceController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentExperienceIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentExperienceListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentExperienceInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentExperienceIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentExperienceListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentExperienceInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;
 import com.citupro.module.menduner.flames.service.StudentExperienceService;
 import com.citupro.module.menduner.flames.service.StudentExperienceService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentInternshipCertificateController.java

@@ -3,7 +3,7 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipCertificateInfoVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentInternshipCertificateInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipCertificate;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipCertificate;
 import com.citupro.module.menduner.flames.service.StudentInternshipCertificateService;
 import com.citupro.module.menduner.flames.service.StudentInternshipCertificateService;
 import com.citupro.module.menduner.flames.util.RequestParmterModel;
 import com.citupro.module.menduner.flames.util.RequestParmterModel;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentInternshipReportController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipReportIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentInternshipReportListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentInternshipReportInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentInternshipReportIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentInternshipReportListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentInternshipReportInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipReport;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipReport;
 import com.citupro.module.menduner.flames.service.StudentInternshipReportService;
 import com.citupro.module.menduner.flames.service.StudentInternshipReportService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentJobIntentionController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentJobIntentionIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentJobIntentionListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentJobIntentionInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentJobIntentionIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentJobIntentionListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentJobIntentionInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;
 import com.citupro.module.menduner.flames.service.StudentJobIntentionService;
 import com.citupro.module.menduner.flames.service.StudentJobIntentionService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentLanguageController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentLanguageIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentLanguageListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentLanguageInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentLanguageIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentLanguageListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentLanguageInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;
 import com.citupro.module.menduner.flames.service.StudentLanguageService;
 import com.citupro.module.menduner.flames.service.StudentLanguageService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 2 - 2
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudentRecommendationController.java

@@ -3,8 +3,8 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudentRecommendationListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudentRecommendationInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudentRecommendationListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentRecommendationInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudentRecommendation;
 import com.citupro.module.menduner.flames.dal.mysql.StudentRecommendation;
 import com.citupro.module.menduner.flames.service.StudentRecommendationService;
 import com.citupro.module.menduner.flames.service.StudentRecommendationService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudnetAwardExperienceController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudnetAwardExperienceIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudnetAwardExperienceListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudnetAwardExperienceInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudnetAwardExperienceIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudnetAwardExperienceListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudnetAwardExperienceInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;
 import com.citupro.module.menduner.flames.service.StudnetAwardExperienceService;
 import com.citupro.module.menduner.flames.service.StudnetAwardExperienceService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/StudnetSampleController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudnetSampleIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.StudnetSampleListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.StudnetSampleInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudnetSampleIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.student.StudnetSampleListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudnetSampleInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;
 import com.citupro.module.menduner.flames.service.StudnetSampleService;
 import com.citupro.module.menduner.flames.service.StudnetSampleService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/app/UserAuthRecordController.java

@@ -3,9 +3,9 @@ package com.citupro.module.menduner.flames.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citupro.module.menduner.flames.controller.base.reqvo.UserAuthRecordIdReqVo;
-import com.citupro.module.menduner.flames.controller.base.reqvo.UserAuthRecordListReqVo;
-import com.citupro.module.menduner.flames.controller.base.vo.UserAuthRecordInfoVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.system.user.auth.UserAuthRecordIdReqVo;
+import com.citupro.module.menduner.flames.controller.base.reqvo.system.user.auth.UserAuthRecordListReqVo;
+import com.citupro.module.menduner.flames.controller.base.vo.system.UserAuthRecordInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.UserAuthRecord;
 import com.citupro.module.menduner.flames.dal.mysql.UserAuthRecord;
 import com.citupro.module.menduner.flames.service.UserAuthRecordService;
 import com.citupro.module.menduner.flames.service.UserAuthRecordService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/BaseStatisticsReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/base/BaseStatisticsReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.base;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/GraphDataReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/base/GraphDataReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.base;
 
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap;
 import lombok.Data;
 import lombok.Data;

+ 2 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EmployeeBusinessMachineStatisticsReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EmployeeBusinessMachineStatisticsReqVo.java

@@ -1,6 +1,7 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.citupro.module.menduner.flames.controller.base.reqvo.base.BaseStatisticsReqVo;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseHotspotsIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseHotspotsIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseHotspotsListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseHotspotsListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseSchoolPracticeListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/EnterpriseSchoolPracticeListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
 import lombok.Data;

+ 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/reqvo/EenterpriseRecruitSaveReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EenterpriseRecruitSaveReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
 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.EnterpriseRecruitTag;

+ 8 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import lombok.Data;
 import lombok.Data;
@@ -142,4 +142,11 @@ public class EnterpriseRecruitListReqVo {
      */
      */
     private String jobCode;
     private String jobCode;
 
 
+
+
+    /**
+     * 招聘会id,示例值(1)
+     */
+    private Long   jobFairId ;//
+
 }
 }

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitPlanIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitPlanIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitPlanListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitPlanListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitPlan;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitPlan;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitTagIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitTagIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/EnterpriseRecruitTagListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/enterprise/recruit/EnterpriseRecruitTagListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.enterprise.recruit;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/PraciceSubmitRecordIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/pracice_submit_record/PraciceSubmitRecordIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.pracice_submit_record;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 4 - 4
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/pracice_submit_record/PraciceSubmitRecordListReqVO.java

@@ -22,10 +22,10 @@ public class PraciceSubmitRecordListReqVO extends HashMap {
     }
     }
 
 
     public List<Integer> getStatuss() {
     public List<Integer> getStatuss() {
-        return statuss;
+      return (List<Integer>) super.get("statuss");
     }
     }
 
 
-    public void setStatuss(List<Integer> statuss) {
-        this.statuss = statuss;
-    }
+//    public void setStatuss(List<Integer> statuss) {
+//        this.statuss = statuss;
+//    }
 }
 }

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolClassListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolClassListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolClass;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolClass;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolDepartmentIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolDepartmentIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolDepartmentListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolDepartmentListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolEnterpriseVisitorRecordExists.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolEnterpriseVisitorRecordExists.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolOrganizationReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolOrganizationReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/SchoolStudentInternshipReqVO.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/school/SchoolStudentInternshipReqVO.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentExperienceIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentExperienceIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentExperienceListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentExperienceListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentInternshipEnterpriseDeptListVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipEnterpriseDeptListVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentInternshipReportIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipReportIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentInternshipReportListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentInternshipReportListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipReport;
 import com.citupro.module.menduner.flames.dal.mysql.StudentInternshipReport;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentJobIntentionIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentJobIntentionIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentJobIntentionListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentJobIntentionListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentLanguageIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentLanguageIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentLanguageListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentLanguageListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudentRecommendationListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudentRecommendationListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudentRecommendation;
 import com.citupro.module.menduner.flames.dal.mysql.StudentRecommendation;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudnetAwardExperienceIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetAwardExperienceIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudnetAwardExperienceListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetAwardExperienceListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudnetSampleIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetSampleIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/StudnetSampleListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/student/StudnetSampleListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.student;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/FeedbackIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/feedback/FeedbackIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.system.feedback;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/FeedbackListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/feedback/FeedbackListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.system.feedback;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/UserAuthRecordIdReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/user/auth/UserAuthRecordIdReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.system.user.auth;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/UserAuthRecordListReqVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/reqvo/system/user/auth/UserAuthRecordListReqVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.reqvo;
+package com.citupro.module.menduner.flames.controller.base.reqvo.system.user.auth;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citupro.module.menduner.flames.dal.mysql.UserAuthRecord;
 import com.citupro.module.menduner.flames.dal.mysql.UserAuthRecord;

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

@@ -1,6 +1,7 @@
 package com.citupro.module.menduner.flames.controller.base.vo;
 package com.citupro.module.menduner.flames.controller.base.vo;
 
 
 
 
+import com.citupro.module.menduner.flames.controller.base.vo.student.StudentInfoVo;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
 import com.citupro.module.menduner.flames.dal.mysql.PraciceSubmitRecord;
 import com.citupro.module.menduner.flames.dal.mysql.PraciceSubmitRecord;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.CommentAnalysis;
 import com.citupro.module.menduner.flames.dal.mysql.CommentAnalysis;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseHotspots;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitExcelVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitExcelVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;

+ 2 - 3
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitInfoVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitInfoVo.java

@@ -1,7 +1,6 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit;
 
 
 
 
-import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
 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.EnterpriseRecruitTag;
 import lombok.Data;
 import lombok.Data;
@@ -12,7 +11,7 @@ import java.util.List;
 public class EnterpriseRecruitInfoVo {
 public class EnterpriseRecruitInfoVo {
     private EnterpriseRecruit enterpriseRecruit;
     private EnterpriseRecruit enterpriseRecruit;
 
 
-    private Enterprise enterprise;
+    private Object enterprise;
 
 
     private List<EnterpriseRecruitTag>  enterpriseRecruitTags;
     private List<EnterpriseRecruitTag>  enterpriseRecruitTags;
 
 

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitPlanInfoVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitPlanInfoVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruit;

+ 1 - 1
menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/EnterpriseRecruitTagInfoVo.java → menduner/menduner-flames-biz/src/main/java/com/citupro/module/menduner/flames/controller/base/vo/enterprise/recruit/EnterpriseRecruitTagInfoVo.java

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.enterprise.recruit;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;
 import com.citupro.module.menduner.flames.dal.mysql.EnterpriseRecruitTag;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.School;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.School;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;
 import com.citupro.module.menduner.flames.dal.mysql.SchoolDepartment;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.school;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudentExperience;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.*;
 import com.citupro.module.menduner.flames.dal.mysql.*;
 import lombok.Data;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.*;
 import com.citupro.module.menduner.flames.dal.mysql.*;
 import lombok.Data;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Student;
 import com.citupro.module.menduner.flames.dal.mysql.Student;
 import lombok.Data;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.*;
 import com.citupro.module.menduner.flames.dal.mysql.*;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;
 import com.citupro.module.menduner.flames.dal.mysql.StudentJobIntention;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;
 import com.citupro.module.menduner.flames.dal.mysql.StudentLanguage;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;
 import com.citupro.module.menduner.flames.dal.mysql.Enterprise;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetAwardExperience;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.student;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;
 import com.citupro.module.menduner.flames.dal.mysql.StudnetSample;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.system;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.AdvertisementMessage;
 import com.citupro.module.menduner.flames.dal.mysql.AdvertisementMessage;
 import lombok.Data;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.system;
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Comment;
 import com.citupro.module.menduner.flames.dal.mysql.Comment;
 import lombok.Data;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.citupro.module.menduner.flames.controller.base.vo;
+package com.citupro.module.menduner.flames.controller.base.vo.system;
 
 
 
 
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;
 import com.citupro.module.menduner.flames.dal.mysql.Feedback;

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini