浏览代码

1、企业用户绑定-增加字段
2、完善企业详细逻辑

rayson 1 年之前
父节点
当前提交
e2cc371cec
共有 43 个文件被更改,包括 363 次插入138 次删除
  1. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpPageReqVO.java
  2. 5 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java
  3. 12 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindPageReqVO.java
  4. 16 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindRespVO.java
  5. 12 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindSaveReqVO.java
  6. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/business/EnterpriseBusinessPageReqVO.java
  7. 4 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/business/EnterpriseBusinessSaveReqVO.java
  8. 3 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoPageReqVO.java
  9. 5 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoSaveReqVO.java
  10. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/projectexp/vo/ProjectExpRespVO.java
  11. 8 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/projectexp/vo/ProjectExpSaveReqVO.java
  12. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/trainexp/vo/TrainExpRespVO.java
  13. 8 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/trainexp/vo/TrainExpSaveReqVO.java
  14. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpPageReqVO.java
  15. 5 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpSaveReqVO.java
  16. 6 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/contact/AppEnterpriseUserContactRespVO.java
  17. 3 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseBusinessRespVO.java
  18. 1 8
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java
  19. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java
  20. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpRespVO.java
  21. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpSaveReqVO.java
  22. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/trainexp/AppTrainExpRespVO.java
  23. 9 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/trainexp/AppTrainExpSaveReqVO.java
  24. 18 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseConvert.java
  25. 15 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/JobAdvertisedConvert.java
  26. 3 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/JobInterestedConvert.java
  27. 16 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseUserBindDO.java
  28. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/projectexp/ProjectExpDO.java
  29. 3 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/trainexp/TrainExpDO.java
  30. 0 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/eduexp/EduExpMapper.java
  31. 0 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseBusinessMapper.java
  32. 7 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserBindMapper.java
  33. 4 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java
  34. 0 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/workexp/WorkExpMapper.java
  35. 5 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterprisePostServiceImpl.java
  36. 8 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java
  37. 19 9
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java
  38. 8 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindService.java
  39. 27 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImpl.java
  40. 102 80
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java
  41. 5 2
      menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImplTest.java
  42. 3 1
      menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImplTest.java
  43. 4 2
      menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImplTest.java

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpPageReqVO.java

@@ -41,11 +41,11 @@ public class EduExpPageReqVO extends PageParam {
 
     @Schema(description = "在校开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "在校结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "在校经历")
     private String content;

+ 5 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java

@@ -2,10 +2,13 @@ package com.citu.module.menduner.system.controller.admin.eduexp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 教育经历新增/修改 Request VO")
 @Data
 public class EduExpSaveReqVO {
@@ -38,10 +41,12 @@ public class EduExpSaveReqVO {
 
     @NotNull(message = "{1_100_006_004}")
     @Schema(description = "在校开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime startTime;
 
     @NotNull(message = "{1_100_006_005}")
     @Schema(description = "在校结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime endTime;
 
     @Schema(description = "在校经历")

+ 12 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindPageReqVO.java

@@ -24,6 +24,18 @@ public class EnterpriseUserBindPageReqVO extends PageParam {
     @Schema(description = "名称", example = "x女士")
     private String name;
 
+    @Schema(description = "用户性别")
+    private Integer sex;
+
+    @Schema(description = "头像地址")
+    private String avatar;
+
+    @Schema(description = "联系手机号")
+    private String phone;
+
+    @Schema(description = "用户邮箱")
+    private String email;
+
     @Schema(description = "岗位id", example = "23317")
     private Long postId;
 

+ 16 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindRespVO.java

@@ -38,6 +38,22 @@ public class EnterpriseUserBindRespVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "用户性别")
+    @ExcelProperty("用户性别")
+    private Integer sex;
+
+    @Schema(description = "头像地址")
+    @ExcelProperty("头像地址")
+    private String avatar;
+
+    @Schema(description = "联系手机号")
+    @ExcelProperty("联系手机号")
+    private String phone;
+
+    @Schema(description = "用户邮箱")
+    @ExcelProperty("用户邮箱")
+    private String email;
+
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "帐号状态(0正常 1停用 2 等待审核 3不通过)", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)

+ 12 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/bind/EnterpriseUserBindSaveReqVO.java

@@ -30,6 +30,18 @@ public class EnterpriseUserBindSaveReqVO {
     @NotEmpty(message = "{1_200_008_002}")
     private String name;
 
+    @Schema(description = "用户性别")
+    private Integer sex;
+
+    @Schema(description = "头像地址")
+    private String avatar;
+
+    @Schema(description = "联系手机号")
+    private String phone;
+
+    @Schema(description = "用户邮箱")
+    private String email;
+
     @Schema(description = "帐号状态(0正常 1停用 2 等待审核 3不通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "{1_200_018_001}")
     private Integer status;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/business/EnterpriseBusinessPageReqVO.java

@@ -41,7 +41,7 @@ public class EnterpriseBusinessPageReqVO extends PageParam {
 
     @Schema(description = "成立时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] establishmentTime;
+    private LocalDateTime establishmentTime;
 
     @Schema(description = "核准日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)

+ 4 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/business/EnterpriseBusinessSaveReqVO.java

@@ -2,9 +2,12 @@ package com.citu.module.menduner.system.controller.admin.enterprise.business;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 门墩儿-企业工商信息新增/修改 Request VO")
 @Data
 public class EnterpriseBusinessSaveReqVO {
@@ -34,6 +37,7 @@ public class EnterpriseBusinessSaveReqVO {
     private String representative;
 
     @Schema(description = "成立时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime establishmentTime;
 
     @Schema(description = "注册资金")

+ 3 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoPageReqVO.java

@@ -9,6 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 人才信息-个人档案分页 Request VO")
@@ -39,6 +40,7 @@ public class PersonInfoPageReqVO extends PageParam {
     private String wxCode;
 
     @Schema(description = "出生日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime birthday;
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
@@ -54,6 +56,7 @@ public class PersonInfoPageReqVO extends PageParam {
     private Integer jobStatus;
 
     @Schema(description = "首次工作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime firstWorkTime;
 
     @Schema(description = "个人优势")

+ 5 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/info/PersonInfoSaveReqVO.java

@@ -2,9 +2,12 @@ package com.citu.module.menduner.system.controller.admin.person.vo.info;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 人才信息-个人档案新增/修改 Request VO")
 @Data
 public class PersonInfoSaveReqVO {
@@ -34,6 +37,7 @@ public class PersonInfoSaveReqVO {
     private String wxCode;
 
     @Schema(description = "出生日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime birthday;
 
     @Schema(description = "婚姻状况(0未婚 1已婚 2离异 3保密)", example = "1")
@@ -49,6 +53,7 @@ public class PersonInfoSaveReqVO {
     private Integer jobStatus;
 
     @Schema(description = "首次工作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime firstWorkTime;
 
     @Schema(description = "个人优势")

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/projectexp/vo/ProjectExpRespVO.java

@@ -27,11 +27,11 @@ public class ProjectExpRespVO {
 
     @Schema(description = "项目开始时间")
     @ExcelProperty("项目开始时间")
-    private LocalDate startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "项目结束时间")
     @ExcelProperty("项目结束时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "描述内容")
     @ExcelProperty("描述内容")

+ 8 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/projectexp/vo/ProjectExpSaveReqVO.java

@@ -2,8 +2,12 @@ package com.citu.module.menduner.system.controller.admin.projectexp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 门墩儿-项目经历新增/修改 Request VO")
 @Data
@@ -19,10 +23,12 @@ public class ProjectExpSaveReqVO {
     private String name;
 
     @Schema(description = "项目开始时间")
-    private LocalDate startTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime startTime;
 
     @Schema(description = "项目结束时间")
-    private LocalDate endTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
 
     @Schema(description = "描述内容")
     private String content;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/trainexp/vo/TrainExpRespVO.java

@@ -23,11 +23,11 @@ public class TrainExpRespVO {
 
     @Schema(description = "培训开始时间")
     @ExcelProperty("培训开始时间")
-    private LocalDate startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "培训结束时间")
     @ExcelProperty("培训结束时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "培训机构名称", example = "芋艿")
     @ExcelProperty("培训机构名称")

+ 8 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/trainexp/vo/TrainExpSaveReqVO.java

@@ -2,8 +2,12 @@ package com.citu.module.menduner.system.controller.admin.trainexp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 门墩儿-培训经历新增/修改 Request VO")
 @Data
@@ -16,10 +20,12 @@ public class TrainExpSaveReqVO {
     private Long userId;
 
     @Schema(description = "培训开始时间")
-    private LocalDate startTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime startTime;
 
     @Schema(description = "培训结束时间")
-    private LocalDate endTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
 
     @Schema(description = "培训机构名称", example = "芋艿")
     private String orgName;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpPageReqVO.java

@@ -42,11 +42,11 @@ public class WorkExpPageReqVO extends PageParam {
 
     @Schema(description = "在职开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "在职结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "薪酬类型(0月薪 1年薪)", example = "1")
     private Integer payUnit;

+ 5 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/workexp/vo/WorkExpSaveReqVO.java

@@ -2,12 +2,15 @@ package com.citu.module.menduner.system.controller.admin.workexp.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 工作经历新增/修改 Request VO")
 @Data
 public class WorkExpSaveReqVO {
@@ -38,9 +41,11 @@ public class WorkExpSaveReqVO {
     private String positionName;
 
     @Schema(description = "在职开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime startTime;
 
     @Schema(description = "在职结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime endTime;
 
     @Schema(description = "工作内容")

+ 6 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/contact/AppEnterpriseUserContactRespVO.java

@@ -13,12 +13,15 @@ public class AppEnterpriseUserContactRespVO {
     @Schema(description = "用户id", example = "9592")
     private Long userId;
 
-    @Schema(description = "头像", example = "http://123.jpg")
-    private String avatar;
-
     @Schema(description = "联系人名称", example = "9592")
     private String name;
 
+    @Schema(description = "用户性别")
+    private Integer sex;
+
+    @Schema(description = "头像地址")
+    private String avatar;
+
     @Schema(description = "状态,是否在线", example = "0")
     private Integer status;
 

+ 3 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseBusinessRespVO.java

@@ -2,9 +2,12 @@ package com.citu.module.menduner.system.controller.app.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "menduner - 企业工商信息 Response VO")
 @Data
 public class AppEnterpriseBusinessRespVO {

+ 1 - 8
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java

@@ -1,7 +1,6 @@
 package com.citu.module.menduner.system.controller.app.job.vo;
 
 
-import com.citu.framework.excel.core.annotations.DictFormat;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,9 +10,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_JOB_TYPE;
-import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_STATUS;
-
 @Schema(description = "menduner - 招聘职位-详情 Response VO")
 @Data
 public class AppJobAdvertisedDetailRespVO {
@@ -37,7 +33,6 @@ public class AppJobAdvertisedDetailRespVO {
     private Long positionId;
 
     @Schema(description = "招聘类型", example = "2")
-    @DictFormat(MENDUNER_JOB_TYPE)
     private Integer type;
 
     @Schema(description = "工作经验", example = "1")
@@ -74,7 +69,6 @@ public class AppJobAdvertisedDetailRespVO {
     private String latitude;
 
     @Schema(description = "职位状态", example = "2")
-    @DictFormat(MENDUNER_STATUS)
     private Integer status;
 
     @Schema(description = "创建时间")
@@ -87,11 +81,10 @@ public class AppJobAdvertisedDetailRespVO {
     private AppEnterpriseSimpleRespVO enterprise;
 
     @Schema(description = "企业在招职位数量")
-    private Integer jobAdvertisedNum;
+    private Long jobAdvertisedNum;
 
     @Schema(description = "招聘联系人信息")
     private AppEnterpriseUserContactRespVO contact;
 
 
-
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java

@@ -57,6 +57,6 @@ public class AppJobAdvertisedPageReqVO extends PageParam {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    private LocalDateTime createTime;
 
 }

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpRespVO.java

@@ -17,10 +17,10 @@ public class AppProjectExpRespVO {
     private String name;
 
     @Schema(description = "项目开始时间")
-    private LocalDate startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "项目结束时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "描述内容")
     private String content;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpSaveReqVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Schema(description = "menduner - 门墩儿-项目经历新增/修改 Request VO")
 @Data
@@ -20,11 +20,11 @@ public class AppProjectExpSaveReqVO {
 
     @NotNull(message = "{1_200_016_003}")
     @Schema(description = "项目开始时间")
-    private LocalDate startTime;
+    private LocalDateTime startTime;
 
     @NotNull(message = "{1_200_016_004}")
     @Schema(description = "项目结束时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "描述内容")
     private String content;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/trainexp/AppTrainExpRespVO.java

@@ -14,10 +14,10 @@ public class AppTrainExpRespVO {
     private Long id;
 
     @Schema(description = "培训开始时间")
-    private LocalDate startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "培训结束时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "培训机构名称", example = "芋艿")
     private String orgName;

+ 9 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/trainexp/AppTrainExpSaveReqVO.java

@@ -2,10 +2,14 @@ package com.citu.module.menduner.system.controller.app.person.trainexp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "menduner - 门墩儿-培训经历新增/修改 Request VO")
 @Data
@@ -16,11 +20,14 @@ public class AppTrainExpSaveReqVO {
 
     @NotNull(message = "{1_200_015_002}")
     @Schema(description = "培训开始时间")
-    private LocalDate startTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime startTime;
+
 
     @NotNull(message = "{1_200_015_003}")
     @Schema(description = "培训结束时间")
-    private LocalDate endTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
 
     @NotBlank(message = "{1_200_015_004}")
     @Schema(description = "培训机构名称", example = "芋艿")

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

@@ -0,0 +1,18 @@
+package com.citu.module.menduner.system.convert;
+
+import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface EnterpriseConvert {
+
+    EnterpriseConvert INSTANCE = Mappers.getMapper(EnterpriseConvert.class);
+
+    AppEnterpriseSimpleRespVO convert(EnterpriseDO bean);
+
+    AppEnterpriseUserContactRespVO convert(EnterpriseUserBindDO bean);
+}

+ 15 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/JobAdvertisedConvert.java

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.convert;
+
+import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedDetailRespVO;
+import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface JobAdvertisedConvert {
+
+    JobAdvertisedConvert INSTANCE = Mappers.getMapper(JobAdvertisedConvert.class);
+
+
+    AppJobAdvertisedDetailRespVO convert(JobAdvertisedDO bean);
+}

+ 3 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/JobInterestedConvert.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.convert;
 
+import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.app.person.job.AppJobInterestedRespVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobInterestedDO;
 import org.mapstruct.Mapper;
@@ -13,4 +14,6 @@ public interface JobInterestedConvert  {
     JobInterestedConvert INSTANCE = Mappers.getMapper(JobInterestedConvert.class);
 
     List<AppJobInterestedRespVO> convertList(List<JobInterestedDO> list);
+
+    AppJobAdvertisedDetailRespVO convert(JobInterestedDO bean);
 }

+ 16 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseUserBindDO.java

@@ -45,6 +45,22 @@ public class EnterpriseUserBindDO extends BaseDO {
      * 名称
      */
     private String name;
+    /**
+     * 用户性别
+     */
+    private Integer sex;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 联系手机号
+     */
+    private String phone;
+    /**
+     * 用户邮箱
+     */
+    private String email;
     /**
      * 帐号状态(0正常 1停用 2 等待审核 3不通过)
      * <p>

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/projectexp/ProjectExpDO.java

@@ -40,11 +40,11 @@ public class ProjectExpDO extends BaseDO {
     /**
      * 项目开始时间
      */
-    private LocalDate startTime;
+    private LocalDateTime startTime;
     /**
      * 项目结束时间
      */
-    private LocalDate endTime;
+    private LocalDateTime endTime;
     /**
      * 描述内容
      */

+ 3 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/trainexp/TrainExpDO.java

@@ -7,6 +7,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 门墩儿-培训经历 DO
@@ -35,11 +36,11 @@ public class TrainExpDO extends BaseDO {
     /**
      * 培训开始时间
      */
-    private LocalDate startTime;
+    private LocalDateTime startTime;
     /**
      * 培训结束时间
      */
-    private LocalDate endTime;
+    private LocalDateTime endTime;
     /**
      * 培训机构名称
      */

+ 0 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/eduexp/EduExpMapper.java

@@ -24,8 +24,6 @@ public interface EduExpMapper extends BaseMapperX<EduExpDO> {
                 .eqIfPresent(EduExpDO::getEducationSystemType, reqVO.getEducationSystemType())
                 .eqIfPresent(EduExpDO::getMajorId, reqVO.getMajorId())
                 .likeRightIfPresent(EduExpDO::getMajor, reqVO.getMajor())
-                .betweenIfPresent(EduExpDO::getStartTime, reqVO.getStartTime())
-                .betweenIfPresent(EduExpDO::getEndTime, reqVO.getEndTime())
                 .eqIfPresent(EduExpDO::getContent, reqVO.getContent())
                 .betweenIfPresent(EduExpDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(EduExpDO::getId));

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

@@ -24,7 +24,6 @@ public interface EnterpriseBusinessMapper extends BaseMapperX<EnterpriseBusiness
                 .eqIfPresent(EnterpriseBusinessDO::getArea, reqVO.getArea())
                 .likeIfPresent(EnterpriseBusinessDO::getAddress, reqVO.getAddress())
                 .eqIfPresent(EnterpriseBusinessDO::getRepresentative, reqVO.getRepresentative())
-                .betweenIfPresent(EnterpriseBusinessDO::getEstablishmentTime, reqVO.getEstablishmentTime())
                 .betweenIfPresent(EnterpriseBusinessDO::getApprovalTime, reqVO.getApprovalTime())
                 .likeIfPresent(EnterpriseBusinessDO::getFormerName, reqVO.getFormerName())
                 .eqIfPresent(EnterpriseBusinessDO::getIndustry, reqVO.getIndustry())

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

@@ -26,8 +26,15 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
                 .orderByDesc(EnterpriseUserBindDO::getId));
     }
 
+
     default EnterpriseUserBindDO selectByUserId(Long userId) {
         return selectOne(EnterpriseUserBindDO::getUserId, userId);
     }
 
+    default EnterpriseUserBindDO selectByEnterpriseIdAndUserId(Long enterpriseId,Long userId) {
+        return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
+                .eq(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
+                .eq(EnterpriseUserBindDO::getUserId, userId));
+    }
+
 }

+ 4 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -33,4 +33,8 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .orderByDesc(JobAdvertisedDO::getId));
     }
 
+    default Long countByEnterpriseId(Long enterpriseId) {
+        return selectCount(JobAdvertisedDO::getEnterpriseId, enterpriseId);
+    }
+
 }

+ 0 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/workexp/WorkExpMapper.java

@@ -26,8 +26,6 @@ public interface WorkExpMapper extends BaseMapperX<WorkExpDO> {
                 .likeRightIfPresent(WorkExpDO::getDeptName, reqVO.getDeptName())
                 .eqIfPresent(WorkExpDO::getPositionId, reqVO.getPositionId())
                 .likeRightIfPresent(WorkExpDO::getPositionName, reqVO.getPositionName())
-                .betweenIfPresent(WorkExpDO::getStartTime, reqVO.getStartTime())
-                .betweenIfPresent(WorkExpDO::getEndTime, reqVO.getEndTime())
                 .eqIfPresent(WorkExpDO::getPayUnit, reqVO.getPayUnit())
                 .eqIfPresent(WorkExpDO::getCurrencyType, reqVO.getCurrencyType())
                 .betweenIfPresent(WorkExpDO::getCreateTime, reqVO.getCreateTime())

+ 5 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterprisePostServiceImpl.java

@@ -60,7 +60,11 @@ public class EnterprisePostServiceImpl implements EnterprisePostService {
 
     @Override
     public EnterprisePostDO getEnterprisePost(Long id) {
-        return enterprisePostMapper.selectById(id);
+        EnterprisePostDO postDO = enterprisePostMapper.selectById(id);
+        if (null == postDO) {
+            throw exception(ENTERPRISE_POST_NOT_EXISTS);
+        }
+        return postDO;
     }
 
     @Override

+ 8 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java

@@ -104,4 +104,12 @@ public interface EnterpriseService {
      * @return 分页简易企业对象
      **/
     PageResult<AppEnterpriseSimpleRespVO> search(AppEnterpriseSearchPageReqVO reqVO);
+
+    /**
+     * 根据企业id获取简易的企业信息
+     *
+     * @param id
+     * @return 企业信息
+     **/
+    AppEnterpriseSimpleRespVO getEnterpriseSimple(Long id);
 }

+ 19 - 9
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -9,6 +9,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.vo.Enterprise
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseSaveReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.*;
+import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
@@ -127,7 +128,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     public AppEnterpriseDetailRespVO getEnterpriseDetail(Long id) {
         AppEnterpriseDetailRespVO respVO = new AppEnterpriseDetailRespVO();
 
-        AppEnterpriseRespVO enterprise =new AppEnterpriseRespVO();
+        AppEnterpriseRespVO enterprise = new AppEnterpriseRespVO();
         enterprise.setId(id);
         enterprise.setName("xx门墩儿信息科技有限公司");
         enterprise.setAnotherName("门墩儿科技");
@@ -144,7 +145,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 "https://img.bosszhipin.com/beijin/upload/com/img/20210113/9721a38a2ee987949634e03ebcbeeb768c9fa67a7309bcd3394445118f39eee3.jpg?x-oss-process=image/auto-orient,1/watermark,size_18,t_50,color_FFFFFF,text_QOacrOWbvueUseivpeWFrOWPuOazqOWGjOeUqOaIt-S4iuS8oA==,type_ZHJvaWRzYW5zZmFsbGJhY2s,image/resize,p_50",
                 "https://zhipin-company-1251955568.file.myqcloud.com/zhipin-company/99/20231021/fp3692be34c52d0ad19616e3b18f94cf83_3f6de97ce4f7480c9b9b921159a0c077-OSS11.aac.s44100.stereo.1080x606.b2000000.libx264.mp4?sign=b463389d85d317d95084aee80e52ff12&t=1715836781",
                 "https://img.bosszhipin.com/beijin/upload/com/img/20210113/753ff7a19883590a242e1e3ff779e5f48c9fa67a7309bcd3394445118f39eee3.jpg?x-oss-process=image/auto-orient,1/watermark,size_18,t_50,color_FFFFFF,text_QOacrOWbvueUseivpeWFrOWPuOazqOWGjOeUqOaIt-S4iuS8oA==,type_ZHJvaWRzYW5zZmFsbGJhY2s,image/resize,p_50"
-                ));
+        ));
         enterprise.setWorkTime("上午09:00 - 下午06:00");
         enterprise.setDevelopHistory("2019-2021 成立xxx \n 2021-2023 建立分公司");
         enterprise.setReceivedHonors("拿了很多奖");
@@ -152,7 +153,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setCreateTime(LocalDateTime.now());
         respVO.setEnterprise(enterprise);
 
-        AppEnterpriseBusinessRespVO business =new AppEnterpriseBusinessRespVO();
+        AppEnterpriseBusinessRespVO business = new AppEnterpriseBusinessRespVO();
         business.setId(1L);
         business.setEnterpriseId(id);
         business.setName("xx门墩儿信息科技有限公司");
@@ -169,12 +170,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         business.setRegisteredCapital("1000万");
         respVO.setBusiness(business);
 
-        List<AppEnterpriseAddressRespVO> addressList=new ArrayList<>();
+        List<AppEnterpriseAddressRespVO> addressList = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
-            AppEnterpriseAddressRespVO address =new AppEnterpriseAddressRespVO();
-            address.setId(i+1L);
+            AppEnterpriseAddressRespVO address = new AppEnterpriseAddressRespVO();
+            address.setId(i + 1L);
             address.setEnterpriseId(id);
-            address.setAddress("广东省广州市天河区天河路"+i+"号");
+            address.setAddress("广东省广州市天河区天河路" + i + "号");
             address.setAreaId(2L);
             address.setLongitude("113.265");
             address.setLatitude("23.132");
@@ -189,8 +190,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
     @Override
     public PageResult<AppEnterpriseSimpleRespVO> search(AppEnterpriseSearchPageReqVO reqVO) {
-        PageResult<AppEnterpriseSimpleRespVO> result=new PageResult<>();
-        List<AppEnterpriseSimpleRespVO> list =new ArrayList<>();
+        PageResult<AppEnterpriseSimpleRespVO> result = new PageResult<>();
+        List<AppEnterpriseSimpleRespVO> list = new ArrayList<>();
         AppEnterpriseSimpleRespVO respVO = new AppEnterpriseSimpleRespVO();
         respVO.setId(1L);
         respVO.setAnotherName("门墩儿科技");
@@ -214,4 +215,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
         return result;
     }
+
+    @Override
+    public AppEnterpriseSimpleRespVO getEnterpriseSimple(Long id) {
+        EnterpriseDO enterprise= enterpriseMapper.selectById(id);
+        if(null == enterprise) {
+            throw exception(MDE_ENTERPRISE_NOT_EXISTS);
+        }
+        return  EnterpriseConvert.INSTANCE.convert(enterprise);
+    }
 }

+ 8 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindService.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.service.enterprise;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
+import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 
 import javax.validation.Valid;
@@ -60,4 +61,11 @@ public interface EnterpriseUserBindService {
      */
     EnterpriseUserBindDO getEnterpriseUserBindById(Long userId);
 
+    /**
+     * 根据联系人id,获取联系人基本信息
+     * @param userId 用户id
+     * @param enterpriseId 企业id
+     **/
+    AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId);
+
 }

+ 27 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImpl.java

@@ -5,6 +5,9 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
+import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.convert.EnterpriseConvert;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,9 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     @Resource
     private EnterpriseUserBindMapper enterpriseUserBindMapper;
 
+    @Resource
+    private EnterprisePostService enterprisePostService;
+
     @Override
     public Long createEnterpriseUserBind(EnterpriseUserBindSaveReqVO createReqVO) {
         // 插入
@@ -73,4 +79,25 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     public EnterpriseUserBindDO getEnterpriseUserBindById(Long userId) {
         return enterpriseUserBindMapper.selectByUserId(userId);
     }
+
+    @Override
+    public AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId) {
+        EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper.selectByEnterpriseIdAndUserId(enterpriseId,userId);
+        if (null == userBindDO) {
+            throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
+        }
+        AppEnterpriseUserContactRespVO resp = EnterpriseConvert.INSTANCE.convert(userBindDO);
+
+        // 获取企业岗位信息
+        if (null != userBindDO.getPostId()) {
+            EnterprisePostDO postDO = enterprisePostService.getEnterprisePost(userBindDO.getPostId());
+            resp.setPostNameCn(postDO.getNameCn());
+            resp.setPostNameEn(postDO.getNameEn());
+            resp.setPostCode(postDO.getCode());
+        }
+
+        //TODO 缓存获取在线状态
+        resp.setStatus(0);
+        return resp;
+    }
 }

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

@@ -11,19 +11,17 @@ import com.citu.module.menduner.system.controller.app.appbase.AppCommonRespVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
 import com.citu.module.menduner.system.controller.app.job.vo.*;
+import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
-import com.citu.module.menduner.system.enums.MendunerStatusEnum;
-import com.citu.module.menduner.system.service.visits.MdeVisitsService;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseUserBindService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -41,6 +39,12 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Resource
     private JobAdvertisedMapper jobAdvertisedMapper;
 
+    @Resource
+    private EnterpriseService enterpriseService;
+
+    @Resource
+    private EnterpriseUserBindService userBindService;
+
     @Override
     public Long createJobAdvertised(JobAdvertisedSaveReqVO createReqVO) {
         // 插入
@@ -375,69 +379,87 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     @Override
     public AppJobAdvertisedDetailRespVO getJobAdvertisedDetail(Long id) {
+//
+//        AppJobAdvertisedDetailRespVO respVO = new AppJobAdvertisedDetailRespVO();
+//        respVO.setId(id);
+//        respVO.setUserId(1L);
+//        respVO.setEnterpriseId(1L);
+//        respVO.setAreaId(110000L);
+//        respVO.setPositionId(1L);
+//        respVO.setPayFrom(BigDecimal.valueOf(5));
+//        respVO.setPayTo(BigDecimal.valueOf(12));
+//        respVO.setPayUnit(2);
+//        respVO.setName("项目经理");
+//        respVO.setExpType(0);
+//        respVO.setEduType(0);
+//        respVO.setTagList(ListUtil.of("无经验要求", "金融产品", "不限", "不接受居家办公", "教育培训", "互联网金融"));
+//
+//        String content = "参与微信搜一搜公众号搜索、小程序搜索、视频号搜索、官方区(比如搜北大)、服务搜索(比如搜洗车、身份证、违章查询)、富展现Box(比如搜宝马320、桂林天气)等业务的算法研发。\n" +
+//                "可能参与的工作方向:\n" +
+//                "1. 检索召回方向:包括Query理解、非必留、query改写、基础相关性、服务链接爬取、服务可用性计算等\n" +
+//                "2. query意图识别方向:服务知识图谱、Query成份解析、服务相关性、自动意图识别、相似Query扩散、预训练语言模型等。\n" +
+//                "3. 搜索排序方向:机构知识图谱、寻址相关性、搜索排序、点击率预估、转化率预估等。\n";
+//        respVO.setContent(content);
+//
+//        String requirement = "计算机、机器学习和数学等相关专业,硕士及以上学历;\n" +
+//                "对数据有理解意识、有洞察力;\n" +
+//                "针对具体业务问题建模能力强;\n" +
+//                "极强的手速、研发能力强;\n" +
+//                "如果具有扎实的机器学习、深度学习和自然语言处理方向的理论和实践基, 会是加分项;\n" +
+//                "如果熟练掌握一种深度学习和深度学习框架(如 Tensorflow/PyTorch/Caffe 等),会是加分项。";
+//        respVO.setRequirement(requirement);
+//
+//        respVO.setAddress("广州海珠区广州T.I.T创意园B5栋");
+//
+//        respVO.setLongitude("113.32531");
+//        respVO.setLatitude("23.099613");
+//
+//        respVO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+//
+//        respVO.setCreateTime(LocalDateTime.now());
+//        respVO.setUpdateTime(LocalDateTime.now());
+//
+//        AppEnterpriseSimpleRespVO enterpriseSimpleRespVO = new AppEnterpriseSimpleRespVO();
+//        enterpriseSimpleRespVO.setId(1L);
+//        enterpriseSimpleRespVO.setName("广州门墩儿科技有限公司");
+//        enterpriseSimpleRespVO.setAnotherName("门墩儿科技");
+//        enterpriseSimpleRespVO.setIndustryId(1L);
+//        enterpriseSimpleRespVO.setScale(0);
+//        enterpriseSimpleRespVO.setFinancingStatus(0);
+//        enterpriseSimpleRespVO.setLogoUrl("https://www.menduner.com/static/img/loginlogo2.7924c12.png");
+//
+//        respVO.setEnterprise(enterpriseSimpleRespVO);
+//        respVO.setJobAdvertisedNum(9);
+//
+//        AppEnterpriseUserContactRespVO contactRespVO = new AppEnterpriseUserContactRespVO();
+//        contactRespVO.setAvatar("https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F5bbef4cc-6268-46d9-87b3-3aa7d2168aad%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1718339519&t=6ff0d47abd90d209ca81b671e898deb8");
+//        contactRespVO.setUserId(1L);
+//        contactRespVO.setEnterpriseId(1L);
+//        contactRespVO.setPostCode("HR");
+//        contactRespVO.setPostNameCn("人事经理");
+//        contactRespVO.setPostNameEn("uman resources");
+//        contactRespVO.setName("肖女士");
+//
+//        respVO.setContact(contactRespVO);
+
+        JobAdvertisedDO job = jobAdvertisedMapper.selectById(id);
+        if (null == job) {
+            throw exception(MDE_JOB_ADVERTISED_NOT_EXISTS);
+        }
+        // 转换
+        AppJobAdvertisedDetailRespVO respVO = JobAdvertisedConvert.INSTANCE.convert(job);
+        // 设置招聘职位数量
+        respVO.setJobAdvertisedNum(jobAdvertisedMapper.countByEnterpriseId(job.getEnterpriseId()));
+
+        // 查询企业信息
+        AppEnterpriseSimpleRespVO enterprise = enterpriseService.
+                getEnterpriseSimple(job.getEnterpriseId());
+        respVO.setEnterprise(enterprise);
 
-        AppJobAdvertisedDetailRespVO respVO = new AppJobAdvertisedDetailRespVO();
-        respVO.setId(id);
-        respVO.setUserId(1L);
-        respVO.setEnterpriseId(1L);
-        respVO.setAreaId(110000L);
-        respVO.setPositionId(1L);
-        respVO.setPayFrom(BigDecimal.valueOf(5));
-        respVO.setPayTo(BigDecimal.valueOf(12));
-        respVO.setPayUnit(2);
-        respVO.setName("项目经理");
-        respVO.setExpType(0);
-        respVO.setEduType(0);
-        respVO.setTagList(ListUtil.of("无经验要求", "金融产品", "不限", "不接受居家办公", "教育培训", "互联网金融"));
-
-        String content = "参与微信搜一搜公众号搜索、小程序搜索、视频号搜索、官方区(比如搜北大)、服务搜索(比如搜洗车、身份证、违章查询)、富展现Box(比如搜宝马320、桂林天气)等业务的算法研发。\n" +
-                "可能参与的工作方向:\n" +
-                "1. 检索召回方向:包括Query理解、非必留、query改写、基础相关性、服务链接爬取、服务可用性计算等\n" +
-                "2. query意图识别方向:服务知识图谱、Query成份解析、服务相关性、自动意图识别、相似Query扩散、预训练语言模型等。\n" +
-                "3. 搜索排序方向:机构知识图谱、寻址相关性、搜索排序、点击率预估、转化率预估等。\n";
-        respVO.setContent(content);
-
-        String requirement = "计算机、机器学习和数学等相关专业,硕士及以上学历;\n" +
-                "对数据有理解意识、有洞察力;\n" +
-                "针对具体业务问题建模能力强;\n" +
-                "极强的手速、研发能力强;\n" +
-                "如果具有扎实的机器学习、深度学习和自然语言处理方向的理论和实践基, 会是加分项;\n" +
-                "如果熟练掌握一种深度学习和深度学习框架(如 Tensorflow/PyTorch/Caffe 等),会是加分项。";
-        respVO.setRequirement(requirement);
-
-        respVO.setAddress("广州海珠区广州T.I.T创意园B5栋");
-
-        respVO.setLongitude("113.32531");
-        respVO.setLatitude("23.099613");
-
-        respVO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
-
-        respVO.setCreateTime(LocalDateTime.now());
-        respVO.setUpdateTime(LocalDateTime.now());
-
-        AppEnterpriseSimpleRespVO enterpriseSimpleRespVO = new AppEnterpriseSimpleRespVO();
-        enterpriseSimpleRespVO.setId(1L);
-        enterpriseSimpleRespVO.setName("广州门墩儿科技有限公司");
-        enterpriseSimpleRespVO.setAnotherName("门墩儿科技");
-        enterpriseSimpleRespVO.setIndustryId(1L);
-        enterpriseSimpleRespVO.setScale(0);
-        enterpriseSimpleRespVO.setFinancingStatus(0);
-        enterpriseSimpleRespVO.setLogoUrl("https://www.menduner.com/static/img/loginlogo2.7924c12.png");
-
-        respVO.setEnterprise(enterpriseSimpleRespVO);
-        respVO.setJobAdvertisedNum(9);
-
-        AppEnterpriseUserContactRespVO contactRespVO = new AppEnterpriseUserContactRespVO();
-        contactRespVO.setAvatar("https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F5bbef4cc-6268-46d9-87b3-3aa7d2168aad%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1718339519&t=6ff0d47abd90d209ca81b671e898deb8");
-        contactRespVO.setUserId(1L);
-        contactRespVO.setEnterpriseId(1L);
-        contactRespVO.setPostCode("HR");
-        contactRespVO.setPostNameCn("人事经理");
-        contactRespVO.setPostNameEn("uman resources");
-        contactRespVO.setName("肖女士");
-
+        // 查询联系人信息
+        AppEnterpriseUserContactRespVO contactRespVO = userBindService.
+                getEnterpriseUserContact(enterprise.getId(), respVO.getUserId());
         respVO.setContact(contactRespVO);
-
         return respVO;
     }
 
@@ -449,11 +471,11 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Override
     public PageResult<AppJobAdvertisedSearchRespVO> search(AppJobAdvertisedSearchPageReqVO reqVO) {
 
-        PageResult<AppJobAdvertisedSearchRespVO> result =new PageResult<>();
-        List<AppJobAdvertisedSearchRespVO> list =new ArrayList<>();
-        AppJobAdvertisedSearchRespVO respVO =new AppJobAdvertisedSearchRespVO();
+        PageResult<AppJobAdvertisedSearchRespVO> result = new PageResult<>();
+        List<AppJobAdvertisedSearchRespVO> list = new ArrayList<>();
+        AppJobAdvertisedSearchRespVO respVO = new AppJobAdvertisedSearchRespVO();
 
-        AppJobAdvertisedSimpleRespVO job=new AppJobAdvertisedSimpleRespVO();
+        AppJobAdvertisedSimpleRespVO job = new AppJobAdvertisedSimpleRespVO();
         job.setId(1L);
         job.setAreaId(110000L);
         job.setPositionId(1L);
@@ -466,7 +488,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         job.setTagList(ListUtil.of("无经验要求", "金融产品", "不限", "不接受居家办公", "教育培训", "互联网金融"));
         respVO.setJob(job);
 
-        AppEnterpriseSimpleRespVO enterprise =new AppEnterpriseSimpleRespVO();
+        AppEnterpriseSimpleRespVO enterprise = new AppEnterpriseSimpleRespVO();
         enterprise.setId(1L);
         enterprise.setName("广州门墩儿科技有限公司");
         enterprise.setAnotherName("门墩儿科技");
@@ -477,7 +499,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
         respVO.setEnterprise(enterprise);
 
-        AppEnterpriseUserContactRespVO contact =new AppEnterpriseUserContactRespVO();
+        AppEnterpriseUserContactRespVO contact = new AppEnterpriseUserContactRespVO();
         contact.setAvatar("https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F5bbef4cc-6268-46d9-87b3-3aa7d2168aad%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1718339519&t=6ff0d47abd90d209ca81b671e898deb8");
         contact.setUserId(1L);
         contact.setEnterpriseId(1L);
@@ -496,11 +518,11 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     @Override
     public List<AppCommonRespVO> getJobPositionCountByEnterpriseId(Long enterpriseId) {
-        List<AppCommonRespVO> list =new ArrayList<>();
+        List<AppCommonRespVO> list = new ArrayList<>();
         for (int i = 1; i < 5; i++) {
-            AppCommonRespVO respVO =new AppCommonRespVO();
-            respVO.setKey(""+i);
-            respVO.setValue(""+i);
+            AppCommonRespVO respVO = new AppCommonRespVO();
+            respVO.setKey("" + i);
+            respVO.setValue("" + i);
             list.add(respVO);
         }
         return list;
@@ -508,11 +530,11 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     @Override
     public List<AppCommonRespVO> getJobAreaCountByEnterpriseId(Long enterpriseId) {
-        List<AppCommonRespVO> list =new ArrayList<>();
+        List<AppCommonRespVO> list = new ArrayList<>();
         for (int i = 1; i < 5; i++) {
-            AppCommonRespVO respVO =new AppCommonRespVO();
-            respVO.setKey(""+i);
-            respVO.setValue(""+i);
+            AppCommonRespVO respVO = new AppCommonRespVO();
+            respVO.setKey("" + i);
+            respVO.setValue("" + i);
             list.add(respVO);
         }
         return list;

+ 5 - 2
menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImplTest.java

@@ -15,6 +15,9 @@ import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
@@ -148,8 +151,8 @@ public class EduExpServiceImplTest extends BaseDbUnitTest {
        reqVO.setEducationSystemType(null);
        reqVO.setMajorId(null);
        reqVO.setMajor(null);
-       reqVO.setStartTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setEndTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+       reqVO.setStartTime(LocalDateTime.now());
+       reqVO.setEndTime(LocalDateTime.now());
        reqVO.setContent(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 

+ 3 - 1
menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImplTest.java

@@ -16,6 +16,8 @@ import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
 
+import java.time.LocalDateTime;
+
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
@@ -159,7 +161,7 @@ public class EnterpriseBusinessServiceImplTest extends BaseDbUnitTest {
         reqVO.setArea(null);
         reqVO.setAddress(null);
         reqVO.setRepresentative(null);
-        reqVO.setEstablishmentTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setEstablishmentTime(LocalDateTime.now());
         reqVO.setFormerName(null);
         reqVO.setIndustry(null);
         reqVO.setRegistrationAuthority(null);

+ 4 - 2
menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImplTest.java

@@ -15,6 +15,8 @@ import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
 
+import java.time.LocalDateTime;
+
 import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
@@ -151,8 +153,8 @@ public class WorkExpServiceImplTest extends BaseDbUnitTest {
        reqVO.setDeptName(null);
        reqVO.setPositionId(null);
        reqVO.setPositionName(null);
-       reqVO.setStartTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setEndTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+       reqVO.setStartTime(LocalDateTime.now());
+       reqVO.setEndTime(LocalDateTime.now());
        reqVO.setPayUnit(null);
        reqVO.setCurrencyType(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));