Bladeren bron

企业认证状态修改

yanliming 2 jaren geleden
bovenliggende
commit
0ea90e3968
100 gewijzigde bestanden met toevoegingen van 1 en 4229 verwijderingen
  1. 1 1
      build.groovy
  2. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/dao/CityDAO.java
  3. 0 21
      common/src/main/java/com/jpsoft/employment/modules/base/dao/CompanyDAO.java
  4. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/dao/EnterpriseCertificationApproveDAO.java
  5. 0 18
      common/src/main/java/com/jpsoft/employment/modules/base/dao/LabourServicesApproveDAO.java
  6. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/dao/LabourServicesDAO.java
  7. 0 23
      common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageNoticeDAO.java
  8. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageReadDAO.java
  9. 0 21
      common/src/main/java/com/jpsoft/employment/modules/base/dao/MobileBannerInfoDAO.java
  10. 0 19
      common/src/main/java/com/jpsoft/employment/modules/base/dao/ResumeApproveDAO.java
  11. 0 19
      common/src/main/java/com/jpsoft/employment/modules/base/dao/ServiceApproveDAO.java
  12. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/dao/UserAuthenticationApproveDAO.java
  13. 0 49
      common/src/main/java/com/jpsoft/employment/modules/base/dto/CompanyDTO.java
  14. 0 39
      common/src/main/java/com/jpsoft/employment/modules/base/dto/HrIndexDataDTO.java
  15. 0 28
      common/src/main/java/com/jpsoft/employment/modules/base/entity/City.java
  16. 0 93
      common/src/main/java/com/jpsoft/employment/modules/base/entity/Company.java
  17. 0 49
      common/src/main/java/com/jpsoft/employment/modules/base/entity/EnterpriseCertificationApprove.java
  18. 0 63
      common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServices.java
  19. 0 50
      common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServicesApprove.java
  20. 0 66
      common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageNotice.java
  21. 0 43
      common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageRead.java
  22. 0 89
      common/src/main/java/com/jpsoft/employment/modules/base/entity/MobileBannerInfo.java
  23. 0 45
      common/src/main/java/com/jpsoft/employment/modules/base/entity/ResumeApprove.java
  24. 0 49
      common/src/main/java/com/jpsoft/employment/modules/base/entity/ServiceApprove.java
  25. 0 48
      common/src/main/java/com/jpsoft/employment/modules/base/entity/UserAuthenticationApprove.java
  26. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/service/CityService.java
  27. 0 18
      common/src/main/java/com/jpsoft/employment/modules/base/service/CompanyService.java
  28. 0 20
      common/src/main/java/com/jpsoft/employment/modules/base/service/EnterpriseCertificationApproveService.java
  29. 0 17
      common/src/main/java/com/jpsoft/employment/modules/base/service/LabourServicesApproveService.java
  30. 0 17
      common/src/main/java/com/jpsoft/employment/modules/base/service/LabourServicesService.java
  31. 0 22
      common/src/main/java/com/jpsoft/employment/modules/base/service/MessageNoticeService.java
  32. 0 18
      common/src/main/java/com/jpsoft/employment/modules/base/service/MessageReadService.java
  33. 0 19
      common/src/main/java/com/jpsoft/employment/modules/base/service/MobileBannerInfoService.java
  34. 0 17
      common/src/main/java/com/jpsoft/employment/modules/base/service/ResumeApproveService.java
  35. 0 17
      common/src/main/java/com/jpsoft/employment/modules/base/service/ServiceApproveService.java
  36. 0 18
      common/src/main/java/com/jpsoft/employment/modules/base/service/UserAuthenticationApproveService.java
  37. 0 80
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CityServiceImpl.java
  38. 0 77
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CompanyServiceImpl.java
  39. 0 111
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/EnterpriseCertificationApproveServiceImpl.java
  40. 0 70
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesApproveServiceImpl.java
  41. 0 93
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesServiceImpl.java
  42. 0 91
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageNoticeServiceImpl.java
  43. 0 76
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageReadServiceImpl.java
  44. 0 75
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MobileBannerInfoServiceImpl.java
  45. 0 71
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ResumeApproveServiceImpl.java
  46. 0 71
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ServiceApproveServiceImpl.java
  47. 0 75
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/UserAuthenticationApproveServiceImpl.java
  48. 0 23
      common/src/main/java/com/jpsoft/employment/modules/job/dao/JobUserDAO.java
  49. 0 18
      common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentApproveDAO.java
  50. 0 46
      common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentCollectionDAO.java
  51. 0 59
      common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentDAO.java
  52. 0 21
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDAO.java
  53. 0 21
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverContentDAO.java
  54. 0 26
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverDAO.java
  55. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverRecordDAO.java
  56. 0 21
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeEducationExperienceDAO.java
  57. 0 23
      common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeWorkExperienceDAO.java
  58. 0 28
      common/src/main/java/com/jpsoft/employment/modules/job/dao/UserBrowseDAO.java
  59. 0 27
      common/src/main/java/com/jpsoft/employment/modules/job/dao/UserBrowseHrDAO.java
  60. 0 24
      common/src/main/java/com/jpsoft/employment/modules/job/dao/UserCollectionDAO.java
  61. 0 22
      common/src/main/java/com/jpsoft/employment/modules/job/dao/WorkCategoryDAO.java
  62. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/dto/EducationExpDTO.java
  63. 0 14
      common/src/main/java/com/jpsoft/employment/modules/job/dto/ExpJsonDTO.java
  64. 0 27
      common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserDTO.java
  65. 0 70
      common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserXlsDTO.java
  66. 0 61
      common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverDTO.java
  67. 0 67
      common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverHrDTO.java
  68. 0 25
      common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverRecordDTO.java
  69. 0 55
      common/src/main/java/com/jpsoft/employment/modules/job/dto/TalentPoolDTO.java
  70. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/dto/WorkExpDTO.java
  71. 0 12
      common/src/main/java/com/jpsoft/employment/modules/job/dto/WorkStepDTO.java
  72. 0 10
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ApproveStatusConstant.java
  73. 0 88
      common/src/main/java/com/jpsoft/employment/modules/job/entity/JobUser.java
  74. 0 105
      common/src/main/java/com/jpsoft/employment/modules/job/entity/Recruitment.java
  75. 0 49
      common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentApprove.java
  76. 0 50
      common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentCollection.java
  77. 0 105
      common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentVO.java
  78. 0 119
      common/src/main/java/com/jpsoft/employment/modules/job/entity/Resume.java
  79. 0 65
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliver.java
  80. 0 61
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverContent.java
  81. 0 91
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverRecord.java
  82. 0 62
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeEducationExperience.java
  83. 0 77
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeVO.java
  84. 0 62
      common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeWorkExperience.java
  85. 0 46
      common/src/main/java/com/jpsoft/employment/modules/job/entity/UserBrowse.java
  86. 0 46
      common/src/main/java/com/jpsoft/employment/modules/job/entity/UserBrowseHr.java
  87. 0 47
      common/src/main/java/com/jpsoft/employment/modules/job/entity/UserCollection.java
  88. 0 51
      common/src/main/java/com/jpsoft/employment/modules/job/entity/WorkCategory.java
  89. 0 22
      common/src/main/java/com/jpsoft/employment/modules/job/service/JobUserService.java
  90. 0 17
      common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentApproveService.java
  91. 0 50
      common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentCollectionService.java
  92. 0 60
      common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentService.java
  93. 0 20
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverContentService.java
  94. 0 18
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverRecordService.java
  95. 0 27
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverService.java
  96. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeEducationExperienceService.java
  97. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeService.java
  98. 0 19
      common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeWorkExperienceService.java
  99. 0 26
      common/src/main/java/com/jpsoft/employment/modules/job/service/UserBrowseHrService.java
  100. 0 25
      common/src/main/java/com/jpsoft/employment/modules/job/service/UserBrowseService.java

+ 1 - 1
build.groovy

@@ -2,7 +2,7 @@ pipeline {
     agent any
 
     environment {
-        def appName = "jp-employment"
+        def appName = "jk-temporary-workers"
         def branch = "master"
         def host = '121.37.187.149'
     }

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/dao/CityDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.base.entity.City;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface CityDAO {
-	int insert(City entity);
-	int update(City entity);
-	int exist(String id);
-	City get(int id);
-	int delete(String id);
-	List<City> list();
-	List<City> findByType(String type);
-	List<City> findByPid(int pid);
-	List<City> search(Map<String,Object> searchParams,List<Sort> sortList);
-}

+ 0 - 21
common/src/main/java/com/jpsoft/employment/modules/base/dao/CompanyDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.Company;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface CompanyDAO {
-	int insert(Company entity);
-	int update(Company entity);
-	int exist(String id);
-	Company get(String id);
-	int delete(String id);
-	List<Company> list();
-	List<Company> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-	List<Company> findByAll();
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/dao/EnterpriseCertificationApproveDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface EnterpriseCertificationApproveDAO {
-	int insert(EnterpriseCertificationApprove entity);
-	int update(EnterpriseCertificationApprove entity);
-	int exist(String id);
-	EnterpriseCertificationApprove get(String id);
-	int delete(String id);
-	List<EnterpriseCertificationApprove> list();
-	EnterpriseCertificationApprove findByCompanyId(String companyId);
-	List<EnterpriseCertificationApprove> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/base/dao/LabourServicesApproveDAO.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface LabourServicesApproveDAO {
-	int insert(LabourServicesApprove entity);
-	int update(LabourServicesApprove entity);
-	int exist(String id);
-	LabourServicesApprove get(String id);
-	int delete(String id);
-	List<LabourServicesApprove> list();
-	List<LabourServicesApprove> search(Map<String,Object> searchParams,List<Sort> sortList);
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/dao/LabourServicesDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.LabourServices;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-
-@Repository
-public interface LabourServicesDAO {
-	int insert(LabourServices entity);
-	int update(LabourServices entity);
-	int exist(String id);
-	LabourServices get(String id);
-	int delete(String id);
-	List<LabourServices> list();
-	List<LabourServices> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 23
common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageNoticeDAO.java

@@ -1,23 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.MessageNotice;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface MessageNoticeDAO {
-	int insert(MessageNotice entity);
-	int update(MessageNotice entity);
-	int exist(String id);
-	MessageNotice get(String id);
-	int delete(String id);
-	List<MessageNotice> list();
-	List<MessageNotice> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<MessageNotice> findByUserIdAndClassify(String userId,String classify);
-	List<MessageNotice> findByUserId(String userId);
-	MessageNotice findTopByUserIdAndClassify(String userId,String classify);
-	int findNotRead(String userId,String classify);
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageReadDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.MessageRead;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface MessageReadDAO {
-	int insert(MessageRead entity);
-	int update(MessageRead entity);
-	int exist(String id);
-	MessageRead get(String id);
-	int delete(String id);
-	List<MessageRead> list();
-	List<MessageRead> search(Map<String, Object> searchParams, List<Sort> sortList);
-	MessageRead findByMIdAndUserId(String messageId,String userId);
-}

+ 0 - 21
common/src/main/java/com/jpsoft/employment/modules/base/dao/MobileBannerInfoDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import com.jpsoft.employment.modules.base.entity.MobileBannerInfo;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository
-public interface MobileBannerInfoDAO {
-	int insert(MobileBannerInfo entity);
-	int update(MobileBannerInfo entity);
-	int exist(String id);
-	MobileBannerInfo get(String id);
-	int delete(String id);
-	List<MobileBannerInfo> list();
-	List<MobileBannerInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
-
-    List<MobileBannerInfo> getBannerInfo(String type);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/base/dao/ResumeApproveDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.ResumeApprove;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface ResumeApproveDAO {
-	int insert(ResumeApprove entity);
-	int update(ResumeApprove entity);
-	int exist(String id);
-	ResumeApprove get(String id);
-	int delete(String id);
-	List<ResumeApprove> list();
-	List<ResumeApprove> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/base/dao/ServiceApproveDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.ServiceApprove;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface ServiceApproveDAO {
-	int insert(ServiceApprove entity);
-	int update(ServiceApprove entity);
-	int exist(String id);
-	ServiceApprove get(String id);
-	int delete(String id);
-	List<ServiceApprove> list();
-	List<ServiceApprove> search(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/dao/UserAuthenticationApproveDAO.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.base.entity.UserAuthenticationApprove;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface UserAuthenticationApproveDAO {
-	int insert(UserAuthenticationApprove entity);
-	int update(UserAuthenticationApprove entity);
-	int exist(String id);
-	UserAuthenticationApprove get(String id);
-	int delete(String id);
-	List<UserAuthenticationApprove> list();
-	List<UserAuthenticationApprove> search(Map<String, Object> searchParams, List<Sort> sortList);
-	UserAuthenticationApprove findByUserId(String userId);
-}

+ 0 - 49
common/src/main/java/com/jpsoft/employment/modules/base/dto/CompanyDTO.java

@@ -1,49 +0,0 @@
-package com.jpsoft.employment.modules.base.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class CompanyDTO {
-    @ApiModelProperty(value = "企业ID")
-    private String id;
-
-    @ApiModelProperty(value = "企业认证ID")
-    private String enterpriseCertificationApproveId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String name;
-
-    @ApiModelProperty(value = "logo")
-    private String logo;
-
-    @ApiModelProperty(value = "企业规模")
-    private String scale;
-
-    @ApiModelProperty(value = "所属行业")
-    private String industry;
-
-    @ApiModelProperty(value = "省")
-    private Integer province;
-
-    @ApiModelProperty(value = "市")
-    private Integer city;
-
-    @ApiModelProperty(value = "区")
-    private Integer zone;
-
-    @ApiModelProperty(value = "企业地址")
-    private String address;
-
-    @ApiModelProperty(value = "联系电话")
-    private String tel;
-
-    @ApiModelProperty(value = "信用代码")
-    private String creditCode;
-
-    @ApiModelProperty(value = "法人代表")
-    private String legalPerson;
-
-    @ApiModelProperty(value = "营业执照")
-    private String businessLicenseUrl;
-}

+ 0 - 39
common/src/main/java/com/jpsoft/employment/modules/base/dto/HrIndexDataDTO.java

@@ -1,39 +0,0 @@
-package com.jpsoft.employment.modules.base.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class HrIndexDataDTO {
-
-    @ApiModelProperty(value = "HR姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "头像")
-    private String photo;
-
-    @ApiModelProperty(value = "所属企业")
-    private String companyName;
-
-    @ApiModelProperty(value = "投递简历数量")
-    private Integer resumeDeliverNum;
-
-    @ApiModelProperty(value = "收藏简历数量")
-    private Integer recruitmentCollectionNum;
-
-    @ApiModelProperty(value = "对我感兴趣数量")
-    private Integer userBrowseNum;
-
-    @ApiModelProperty(value = "昨日浏览数量")
-    private Integer yesterdayBrowseNum;
-
-    @ApiModelProperty(value = "职位流量数据")
-    private List<Map<String,Object>> positionDataFlow;
-
-    @ApiModelProperty(value = "职位流量数据对比")
-    private List<Map<String,Object>> positionDataFlowContrast;
-
-}

+ 0 - 28
common/src/main/java/com/jpsoft/employment/modules/base/entity/City.java

@@ -1,28 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_city的实体类
- */
-@Data
-@ApiModel(value = "base_city的实体类")
-public class City {
-        @ApiModelProperty(value = "")
-    private Integer id;
-        @ApiModelProperty(value = "")
-    private String cityName;
-        @ApiModelProperty(value = "")
-    private Integer type;
-        @ApiModelProperty(value = "")
-    private Integer pid;
-    private String parentId;
-}

+ 0 - 93
common/src/main/java/com/jpsoft/employment/modules/base/entity/Company.java

@@ -1,93 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_company的实体类
- */
-@Data
-@ApiModel(value = "base_company的实体类")
-public class Company {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "企业名称")
-    private String name;
-        @ApiModelProperty(value = "企业类型")
-    private String type;
-        @ApiModelProperty(value = "企业规模")
-    private String scale;
-    private String scaleName;
-        @ApiModelProperty(value = "所属行业")
-    private String industry;
-    @ApiModelProperty(value = "招聘所属地区")
-    private String area;
-    private String industryName;
-        @ApiModelProperty(value = "企业地址")
-    private String address;
-        @ApiModelProperty(value = "企业介绍")
-    private String introduction;
-        @ApiModelProperty(value = "联系人")
-    private String contactPerson;
-        @ApiModelProperty(value = "联系电话")
-    private String tel;
-        @ApiModelProperty(value = "经度")
-    private String longtitude;
-        @ApiModelProperty(value = "纬度")
-    private String latitude;
-        @ApiModelProperty(value = "企业邮箱")
-    private String email;
-        @ApiModelProperty(value = "排序")
-    private Integer sortNo;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "企业认证状态(0:未提交,1:审核中,2:已认证,3:认证失败)")
-    private String isCertification;
-        @ApiModelProperty(value = "信用代码")
-    private String creditCode;
-        @ApiModelProperty(value = "法人代表")
-    private String legalPerson;
-        @ApiModelProperty(value = "法人联系方式")
-    private String legalTel;
-        @ApiModelProperty(value = "营业执照")
-    private String businessLicenseUrl;
-    @ApiModelProperty(value = "logo")
-    private String logo;
-
-
-
-
-    //以下字段用于显示,不保存数据库
-    @ApiModelProperty(value = "企业认证ID")
-    private String enterpriseCertificationApproveId;
-    @ApiModelProperty(value = "省")
-    private Integer province;
-    @ApiModelProperty(value = "市")
-    private Integer city;
-    @ApiModelProperty(value = "区")
-    private Integer zone;
-
-    @ApiModelProperty(value = "招聘岗位数")
-    private Integer postNum;
-    @ApiModelProperty(value = "招聘人数")
-    private Integer peopleNum;
-}

+ 0 - 49
common/src/main/java/com/jpsoft/employment/modules/base/entity/EnterpriseCertificationApprove.java

@@ -1,49 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_enterprise_certification_approve的实体类
- */
-@Data
-@ApiModel(value = "base_enterprise_certification_approve的实体类")
-public class EnterpriseCertificationApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-    private String createByName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "申请认证企业ID")
-    private String companyId;
-    private String companyName;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-    private String approvePersonName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-    @ApiModelProperty(value = "审批状态")
-    private String approveStatus;
-    private String approveStatusName;
-}

+ 0 - 63
common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServices.java

@@ -1,63 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_labour_services的实体类
- */
-@Data
-@ApiModel(value = "base_labour_services的实体类")
-public class LabourServices {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "类型(我要用工人,我有工人等)")
-    private String type;
-    @ApiModelProperty(value = "类型(我要用工人,我有工人等)")
-    private String typeN;
-        @ApiModelProperty(value = "内容")
-    private String content;
-        @ApiModelProperty(value = "状态(上架下架等")
-    private String status;
-        @ApiModelProperty(value = "排序号")
-    private Integer sortNo;
-        @ApiModelProperty(value = "审批状态")
-    private String approvalStatus;
-    @ApiModelProperty(value = "审批状态")
-    private String approvalStatusN;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-
-    @ApiModelProperty(value = "审批人")
-    private String approvePersonName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-        @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "logo")
-    private String logo;
-}

+ 0 - 50
common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServicesApprove.java

@@ -1,50 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_labour_services_approve的实体类
- */
-@Data
-@ApiModel(value = "base_labour_services_approve的实体类")
-public class LabourServicesApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-    private String createByName;
-    private String companyName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "劳务对接ID")
-    private String labourServicesId;
-    private String labourServicesName;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-    private String approvePersonName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-    @ApiModelProperty(value = "审批状态")
-    private String approveStatus;
-    private String approveStatusName;
-}

+ 0 - 66
common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageNotice.java

@@ -1,66 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_message_notice的实体类
- */
-@Data
-@ApiModel(value = "base_message_notice的实体类")
-public class MessageNotice {
-        @ApiModelProperty(value = "ID")
-    private String id;
-        @ApiModelProperty(value = "标题")
-    private String title;
-        @ApiModelProperty(value = "内容")
-    private String content;
-        @ApiModelProperty(value = "收件人ID")
-    private String recipientId;
-    private String recipientName;
-        @ApiModelProperty(value = "审核状态是否")
-    private Boolean status;
-    private String statusName;
-        @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-    @ApiModelProperty(value = "创建人")
-    private String createByN;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "更新人")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-        @ApiModelProperty(value = "分类(字典:通知分类")
-    private String classify;
-    private String classifyName;
-        @ApiModelProperty(value = "类型:1站内通告,2微信")
-    private String type;
-    private String typeName;
-        @ApiModelProperty(value = "点击超链接")
-    private String noticeLink;
-        @ApiModelProperty(value = "是否发送微信消息")
-    private Boolean sendWechat;
-        @ApiModelProperty(value = "消息模板code")
-    private String wechatCode;
-    @ApiModelProperty(value = "是否需要收件人答复")
-    private Boolean isNeedAgree;
-    @ApiModelProperty(value = "投递表ID")
-    private String deliverId;
-
-    @ApiModelProperty(value = "是否已读")
-    private Boolean isRead;
-}

+ 0 - 43
common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageRead.java

@@ -1,43 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_message_read的实体类
- */
-@Data
-@ApiModel(value = "base_message_read的实体类")
-public class MessageRead {
-        @ApiModelProperty(value = "ID")
-    private String id;
-        @ApiModelProperty(value = "消息ID")
-    private String messageId;
-        @ApiModelProperty(value = "用户ID")
-    private String userId;
-        @ApiModelProperty(value = "是否已读")
-    private Boolean isRead;
-        @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "更新人")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    @ApiModelProperty(value = "是否同意")
-    private Boolean isAgree;
-}

+ 0 - 89
common/src/main/java/com/jpsoft/employment/modules/base/entity/MobileBannerInfo.java

@@ -1,89 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 描述:base_mobile_banner_info的实体类
- */
-@Data
-@ApiModel(value = "base_mobile_banner_info的实体类")
-public class MobileBannerInfo {
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String id;
-    /**
-     * 幻灯片标题
-     */
-    @ApiModelProperty(value = "幻灯片标题")
-    private String name;
-    /**
-     * 幻灯片分类
-     */
-    @ApiModelProperty(value = "幻灯片分类")
-    private String classify;
-    /**
-     * 幻灯片链接地址
-     */
-    @ApiModelProperty(value = "幻灯片链接地址")
-    private String linkUrl;
-    /**
-     * 幻灯片图片
-     */
-    @ApiModelProperty(value = "幻灯片图片")
-    private String picUrl;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 是否删除
-     */
-    @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
-
-    @ApiModelProperty(value = "幻灯片分类")
-    private String classifyN;
-
-    @ApiModelProperty(value = "审核状态(0-未审核,1-已审核)")
-    private Boolean enabled;
-
-    @ApiModelProperty(value = "序号")
-    private Integer sortNo;
-
-    @ApiModelProperty(value = "是否根据商品类别显示")
-    private String goodsType;
-
-    @ApiModelProperty(value = "是否是班主任专属")
-    private Boolean isTeachers;
-
-
-
-}

+ 0 - 45
common/src/main/java/com/jpsoft/employment/modules/base/entity/ResumeApprove.java

@@ -1,45 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_resume_approve的实体类
- */
-@Data
-@ApiModel(value = "base_resume_approve的实体类")
-public class ResumeApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "用户ID")
-    private String jobResumeId;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-        @ApiModelProperty(value = "审批状态")
-    private String approvalStatus;
-}

+ 0 - 49
common/src/main/java/com/jpsoft/employment/modules/base/entity/ServiceApprove.java

@@ -1,49 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_service_approve的实体类
- */
-@Data
-@ApiModel(value = "base_service_approve的实体类")
-public class ServiceApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "所在审批表的ID")
-    private String serviceId;
-        @ApiModelProperty(value = "类型(招聘信息审核,企业认证,用户认证等")
-    private String type;
-        @ApiModelProperty(value = "审核状态")
-    private String approveStatus;
-        @ApiModelProperty(value = "所属企业")
-    private String companyId;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-}

+ 0 - 48
common/src/main/java/com/jpsoft/employment/modules/base/entity/UserAuthenticationApprove.java

@@ -1,48 +0,0 @@
-package com.jpsoft.employment.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_user_authentication_approve的实体类
- */
-@Data
-@ApiModel(value = "base_user_authentication_approve的实体类")
-public class UserAuthenticationApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "用户ID")
-    private String jobUserId;
-    private String jobUserName;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-    private String approvePersonName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-        @ApiModelProperty(value = "审批状态")
-    private String approvalStatus;
-    private String approvalStatusName;
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/service/CityService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.base.entity.City;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import io.swagger.models.auth.In;
-
-public interface CityService {
-	City get(int id);
-	boolean exist(String id);
-	int insert(City model);
-	int update(City model);
-	int delete(String id);
-	List<City> list();
-	List<City> findByType(String type);
-	List<City> findByPid(int pid);
-	Page<City> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/base/service/CompanyService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.Company;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface CompanyService {
-	Company get(String id);
-	boolean exist(String id);
-	int insert(Company model);
-	int update(Company model);
-	int delete(String id);
-	List<Company> list();
-	Page<Company> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<Company> findByAll();
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/base/service/EnterpriseCertificationApproveService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.Company;
-import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface EnterpriseCertificationApproveService {
-	EnterpriseCertificationApprove get(String id);
-	boolean exist(String id);
-	int insert(EnterpriseCertificationApprove model);
-	int updateCompany(Company company);
-	int update(EnterpriseCertificationApprove model);
-	int delete(String id);
-	List<EnterpriseCertificationApprove> list();
-	EnterpriseCertificationApprove findByCompanyId(String companyId);
-	Page<EnterpriseCertificationApprove> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 17
common/src/main/java/com/jpsoft/employment/modules/base/service/LabourServicesApproveService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface LabourServicesApproveService {
-	LabourServicesApprove get(String id);
-	boolean exist(String id);
-	int insert(LabourServicesApprove model);
-	int update(LabourServicesApprove model);
-	int delete(String id);
-	List<LabourServicesApprove> list();
-	Page<LabourServicesApprove> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

+ 0 - 17
common/src/main/java/com/jpsoft/employment/modules/base/service/LabourServicesService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.LabourServices;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface LabourServicesService {
-	LabourServices get(String id);
-	boolean exist(String id);
-	int insert(LabourServices model);
-	int update(LabourServices model);
-	int delete(String id);
-	List<LabourServices> list();
-	Page<LabourServices> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 22
common/src/main/java/com/jpsoft/employment/modules/base/service/MessageNoticeService.java

@@ -1,22 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.MessageNotice;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-
-public interface MessageNoticeService {
-	MessageNotice get(String id);
-	boolean exist(String id);
-	int insert(MessageNotice model);
-	int update(MessageNotice model);
-	int delete(String id);
-	List<MessageNotice> list();
-	Page<MessageNotice> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<MessageNotice> findByUserIdAndClassify(String userId,String classify);
-	List<MessageNotice> findByUserId(String userId);
-	MessageNotice findTopByUserIdAndClassify(String userId,String classify);
-	int findNotRead(String userId,String classify);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/base/service/MessageReadService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.MessageRead;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface MessageReadService {
-	MessageRead get(String id);
-	boolean exist(String id);
-	int insert(MessageRead model);
-	int update(MessageRead model);
-	int delete(String id);
-	List<MessageRead> list();
-	Page<MessageRead> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	MessageRead findByMIdAndUserId(String messageId,String userId);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/base/service/MobileBannerInfoService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.MobileBannerInfo;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-import java.util.List;
-import java.util.Map;
-
-public interface MobileBannerInfoService {
-	MobileBannerInfo get(String id);
-	boolean exist(String id);
-	int insert(MobileBannerInfo model);
-	int update(MobileBannerInfo model);
-	int delete(String id);
-	List<MobileBannerInfo> list();
-	List<MobileBannerInfo> getBannerInfo(String type);
-	Page<MobileBannerInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 17
common/src/main/java/com/jpsoft/employment/modules/base/service/ResumeApproveService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.ResumeApprove;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeApproveService {
-	ResumeApprove get(String id);
-	boolean exist(String id);
-	int insert(ResumeApprove model);
-	int update(ResumeApprove model);
-	int delete(String id);
-	List<ResumeApprove> list();
-	Page<ResumeApprove> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 17
common/src/main/java/com/jpsoft/employment/modules/base/service/ServiceApproveService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.ServiceApprove;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ServiceApproveService {
-	ServiceApprove get(String id);
-	boolean exist(String id);
-	int insert(ServiceApprove model);
-	int update(ServiceApprove model);
-	int delete(String id);
-	List<ServiceApprove> list();
-	Page<ServiceApprove> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/base/service/UserAuthenticationApproveService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.UserAuthenticationApprove;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface UserAuthenticationApproveService {
-	UserAuthenticationApprove get(String id);
-	boolean exist(String id);
-	int insert(UserAuthenticationApprove model);
-	int update(UserAuthenticationApprove model);
-	int delete(String id);
-	List<UserAuthenticationApprove> list();
-	Page<UserAuthenticationApprove> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	UserAuthenticationApprove findByUserId(String userId);
-}

+ 0 - 80
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CityServiceImpl.java

@@ -1,80 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.employment.modules.base.dao.CityDAO;
-import com.jpsoft.employment.modules.base.entity.City;
-import com.jpsoft.employment.modules.base.service.CityService;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="cityService")
-public class CityServiceImpl implements CityService {
-	@Resource(name="cityDAO")
-	private CityDAO cityDAO;
-
-	@Override
-	public City get(int id) {
-		// TODO Auto-generated method stub
-		return cityDAO.get(id);
-	}
-
-	@Override
-	public int insert(City model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return cityDAO.insert(model);
-	}
-
-	@Override
-	public int update(City model) {
-		// TODO Auto-generated method stub
-		return cityDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return cityDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = cityDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<City> list() {
-		// TODO Auto-generated method stub
-		return cityDAO.list();
-	}
-
-	@Override
-	public  List<City> findByType(String type){
-		return cityDAO.findByType(type);
-	}
-
-	@Override
-	public List<City> findByPid(int pid){
-		return cityDAO.findByPid(pid);
-	}
-		
-	@Override
-	public Page<City> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<City> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            cityDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 77
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CompanyServiceImpl.java

@@ -1,77 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.CompanyDAO;
-import com.jpsoft.employment.modules.base.entity.Company;
-import com.jpsoft.employment.modules.base.service.CompanyService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="companyService")
-public class CompanyServiceImpl implements CompanyService {
-	@Resource(name="companyDAO")
-	private CompanyDAO companyDAO;
-
-	@Override
-	public Company get(String id) {
-		// TODO Auto-generated method stub
-		return companyDAO.get(id);
-	}
-
-	@Override
-	public int insert(Company model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return companyDAO.insert(model);
-	}
-
-	@Override
-	public int update(Company model) {
-		// TODO Auto-generated method stub
-		return companyDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return companyDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = companyDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Company> list() {
-		// TODO Auto-generated method stub
-		return companyDAO.list();
-	}
-		
-	@Override
-	public Page<Company> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<Company> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            companyDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<Company> findByAll(){
-		return companyDAO.findByAll();
-	}
-}

+ 0 - 111
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/EnterpriseCertificationApproveServiceImpl.java

@@ -1,111 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.CompanyDAO;
-import com.jpsoft.employment.modules.base.dao.EnterpriseCertificationApproveDAO;
-import com.jpsoft.employment.modules.base.entity.Company;
-import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
-import com.jpsoft.employment.modules.base.service.EnterpriseCertificationApproveService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="enterpriseCertificationApproveService")
-public class EnterpriseCertificationApproveServiceImpl implements EnterpriseCertificationApproveService {
-	@Resource(name="enterpriseCertificationApproveDAO")
-	private EnterpriseCertificationApproveDAO enterpriseCertificationApproveDAO;
-
-	@Resource(name="companyDAO")
-	private CompanyDAO companyDAO;
-
-	@Override
-	public EnterpriseCertificationApprove get(String id) {
-		// TODO Auto-generated method stub
-		return enterpriseCertificationApproveDAO.get(id);
-	}
-
-	@Override
-	public int insert(EnterpriseCertificationApprove model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return enterpriseCertificationApproveDAO.insert(model);
-	}
-
-	@Override
-	public int updateCompany(Company company){
-		int affectCount = companyDAO.update(company);
-
-		int count = 0;
-
-		if(affectCount>0){
-			EnterpriseCertificationApprove item = enterpriseCertificationApproveDAO.findByCompanyId(company.getId());
-
-			if(item!=null){
-				item.setUpdateBy(company.getUpdateBy());
-				item.setUpdateTime(company.getUpdateTime());
-
-				count = enterpriseCertificationApproveDAO.update(item);
-			}
-			else{
-				item = new EnterpriseCertificationApprove();
-				item.setCompanyId(company.getId());
-				item.setCreateBy(company.getUpdateBy());
-				item.setCreateTime(company.getUpdateTime());
-				item.setId(UUID.randomUUID().toString());
-				item.setDelFlag(false);
-
-				count = enterpriseCertificationApproveDAO.insert(item);
-			}
-		}
-
-		return count;
-	}
-
-	@Override
-	public int update(EnterpriseCertificationApprove model) {
-		// TODO Auto-generated method stub
-		return enterpriseCertificationApproveDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return enterpriseCertificationApproveDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = enterpriseCertificationApproveDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<EnterpriseCertificationApprove> list() {
-		// TODO Auto-generated method stub
-		return enterpriseCertificationApproveDAO.list();
-	}
-
-	@Override
-	public  EnterpriseCertificationApprove findByCompanyId(String companyId){
-		return enterpriseCertificationApproveDAO.findByCompanyId(companyId);
-	}
-		
-	@Override
-	public Page<EnterpriseCertificationApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<EnterpriseCertificationApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            enterpriseCertificationApproveDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 70
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesApproveServiceImpl.java

@@ -1,70 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.employment.modules.base.dao.LabourServicesApproveDAO;
-import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
-import com.jpsoft.employment.modules.base.service.LabourServicesApproveService;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="labourServicesApproveService")
-public class LabourServicesApproveServiceImpl implements LabourServicesApproveService {
-	@Resource(name="labourServicesApproveDAO")
-	private LabourServicesApproveDAO labourServicesApproveDAO;
-
-	@Override
-	public LabourServicesApprove get(String id) {
-		// TODO Auto-generated method stub
-		return labourServicesApproveDAO.get(id);
-	}
-
-	@Override
-	public int insert(LabourServicesApprove model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return labourServicesApproveDAO.insert(model);
-	}
-
-	@Override
-	public int update(LabourServicesApprove model) {
-		// TODO Auto-generated method stub
-		return labourServicesApproveDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return labourServicesApproveDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = labourServicesApproveDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<LabourServicesApprove> list() {
-		// TODO Auto-generated method stub
-		return labourServicesApproveDAO.list();
-	}
-		
-	@Override
-	public Page<LabourServicesApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<LabourServicesApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            labourServicesApproveDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 93
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/LabourServicesServiceImpl.java

@@ -1,93 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.LabourServicesApproveDAO;
-import com.jpsoft.employment.modules.base.dao.LabourServicesDAO;
-import com.jpsoft.employment.modules.base.entity.LabourServices;
-import com.jpsoft.employment.modules.base.entity.LabourServicesApprove;
-import com.jpsoft.employment.modules.base.service.LabourServicesService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="labourServicesService")
-public class LabourServicesServiceImpl implements LabourServicesService {
-	@Resource(name="labourServicesDAO")
-	private LabourServicesDAO labourServicesDAO;
-
-	@Resource(name="labourServicesApproveDAO")
-	private LabourServicesApproveDAO labourServicesApproveDAO;
-
-	@Override
-	public LabourServices get(String id) {
-		// TODO Auto-generated method stub
-		return labourServicesDAO.get(id);
-	}
-
-	@Override
-	public int insert(LabourServices model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-
-		int count = labourServicesDAO.insert(model);
-
-		int affectCount = 0;
-
-		if(count>0){
-			LabourServicesApprove labourServicesApprove = new LabourServicesApprove();
-			labourServicesApprove.setId(UUID.randomUUID().toString());
-			labourServicesApprove.setCreateBy(model.getCreateBy());
-			labourServicesApprove.setCreateTime(model.getCreateTime());
-			labourServicesApprove.setDelFlag(false);
-			labourServicesApprove.setLabourServicesId(model.getId());
-			labourServicesApprove.setApproveStatus(model.getApprovalStatus());
-
-
-			affectCount = labourServicesApproveDAO.insert(labourServicesApprove);
-		}
-		
-		return affectCount;
-	}
-
-	@Override
-	public int update(LabourServices model) {
-		// TODO Auto-generated method stub
-		return labourServicesDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return labourServicesDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = labourServicesDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<LabourServices> list() {
-		// TODO Auto-generated method stub
-		return labourServicesDAO.list();
-	}
-		
-	@Override
-	public Page<LabourServices> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<LabourServices> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            labourServicesDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 91
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageNoticeServiceImpl.java

@@ -1,91 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.MessageNoticeDAO;
-import com.jpsoft.employment.modules.base.entity.MessageNotice;
-import com.jpsoft.employment.modules.base.service.MessageNoticeService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="messageNoticeService")
-public class MessageNoticeServiceImpl implements MessageNoticeService {
-	@Resource(name="messageNoticeDAO")
-	private MessageNoticeDAO messageNoticeDAO;
-
-	@Override
-	public MessageNotice get(String id) {
-		// TODO Auto-generated method stub
-		return messageNoticeDAO.get(id);
-	}
-
-	@Override
-	public int insert(MessageNotice model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return messageNoticeDAO.insert(model);
-	}
-
-	@Override
-	public int update(MessageNotice model) {
-		// TODO Auto-generated method stub
-		return messageNoticeDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return messageNoticeDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = messageNoticeDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<MessageNotice> list() {
-		// TODO Auto-generated method stub
-		return messageNoticeDAO.list();
-	}
-		
-	@Override
-	public Page<MessageNotice> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<MessageNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            messageNoticeDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<MessageNotice> findByUserIdAndClassify(String userId,String classify){
-		return messageNoticeDAO.findByUserIdAndClassify(userId,classify);
-	}
-
-	@Override
-	public List<MessageNotice> findByUserId(String userId){
-		return messageNoticeDAO.findByUserId(userId);
-	}
-
-	@Override
-	public MessageNotice findTopByUserIdAndClassify(String userId,String classify){
-		return messageNoticeDAO.findTopByUserIdAndClassify(userId,classify);
-	}
-
-	@Override
-	public int findNotRead(String userId,String classify){
-		return messageNoticeDAO.findNotRead(userId,classify);
-	}
-}

+ 0 - 76
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageReadServiceImpl.java

@@ -1,76 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.MessageReadDAO;
-import com.jpsoft.employment.modules.base.entity.MessageRead;
-import com.jpsoft.employment.modules.base.service.MessageReadService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="messageReadService")
-public class MessageReadServiceImpl implements MessageReadService {
-	@Resource(name="messageReadDAO")
-	private MessageReadDAO messageReadDAO;
-
-	@Override
-	public MessageRead get(String id) {
-		// TODO Auto-generated method stub
-		return messageReadDAO.get(id);
-	}
-
-	@Override
-	public int insert(MessageRead model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return messageReadDAO.insert(model);
-	}
-
-	@Override
-	public int update(MessageRead model) {
-		// TODO Auto-generated method stub
-		return messageReadDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return messageReadDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = messageReadDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<MessageRead> list() {
-		// TODO Auto-generated method stub
-		return messageReadDAO.list();
-	}
-		
-	@Override
-	public Page<MessageRead> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<MessageRead> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            messageReadDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public MessageRead findByMIdAndUserId(String messageId,String userId){
-		return messageReadDAO.findByMIdAndUserId(messageId,userId);
-	}
-}

+ 0 - 75
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MobileBannerInfoServiceImpl.java

@@ -1,75 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.jpsoft.employment.modules.base.dao.MobileBannerInfoDAO;
-import com.jpsoft.employment.modules.base.entity.MobileBannerInfo;
-import com.jpsoft.employment.modules.base.service.MobileBannerInfoService;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-@Transactional
-@Component(value="mobileBannerInfoService")
-public class MobileBannerInfoServiceImpl implements MobileBannerInfoService {
-	@Resource(name="mobileBannerInfoDAO")
-	private MobileBannerInfoDAO mobileBannerInfoDAO;
-
-	@Override
-	public MobileBannerInfo get(String id) {
-		// TODO Auto-generated method stub
-		return mobileBannerInfoDAO.get(id);
-	}
-
-	@Override
-	public int insert(MobileBannerInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return mobileBannerInfoDAO.insert(model);
-	}
-
-	@Override
-	public int update(MobileBannerInfo model) {
-		// TODO Auto-generated method stub
-		return mobileBannerInfoDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return mobileBannerInfoDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = mobileBannerInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<MobileBannerInfo> list() {
-		// TODO Auto-generated method stub
-		return mobileBannerInfoDAO.list();
-	}
-
-	@Override
-	public List<MobileBannerInfo> getBannerInfo(String type) {
-		// TODO Auto-generated method stub
-		return mobileBannerInfoDAO.getBannerInfo(type);
-	}
-	@Override
-	public Page<MobileBannerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
-        Page<MobileBannerInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            mobileBannerInfoDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 71
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ResumeApproveServiceImpl.java

@@ -1,71 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.ResumeApproveDAO;
-import com.jpsoft.employment.modules.base.entity.ResumeApprove;
-import com.jpsoft.employment.modules.base.service.ResumeApproveService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="resumeApproveService")
-public class ResumeApproveServiceImpl implements ResumeApproveService {
-	@Resource(name="resumeApproveDAO")
-	private ResumeApproveDAO resumeApproveDAO;
-
-	@Override
-	public ResumeApprove get(String id) {
-		// TODO Auto-generated method stub
-		return resumeApproveDAO.get(id);
-	}
-
-	@Override
-	public int insert(ResumeApprove model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return resumeApproveDAO.insert(model);
-	}
-
-	@Override
-	public int update(ResumeApprove model) {
-		// TODO Auto-generated method stub
-		return resumeApproveDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return resumeApproveDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = resumeApproveDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<ResumeApprove> list() {
-		// TODO Auto-generated method stub
-		return resumeApproveDAO.list();
-	}
-		
-	@Override
-	public Page<ResumeApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ResumeApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            resumeApproveDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 71
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ServiceApproveServiceImpl.java

@@ -1,71 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.ServiceApproveDAO;
-import com.jpsoft.employment.modules.base.entity.ServiceApprove;
-import com.jpsoft.employment.modules.base.service.ServiceApproveService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="serviceApproveService")
-public class ServiceApproveServiceImpl implements ServiceApproveService {
-	@Resource(name="serviceApproveDAO")
-	private ServiceApproveDAO serviceApproveDAO;
-
-	@Override
-	public ServiceApprove get(String id) {
-		// TODO Auto-generated method stub
-		return serviceApproveDAO.get(id);
-	}
-
-	@Override
-	public int insert(ServiceApprove model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return serviceApproveDAO.insert(model);
-	}
-
-	@Override
-	public int update(ServiceApprove model) {
-		// TODO Auto-generated method stub
-		return serviceApproveDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return serviceApproveDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = serviceApproveDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<ServiceApprove> list() {
-		// TODO Auto-generated method stub
-		return serviceApproveDAO.list();
-	}
-		
-	@Override
-	public Page<ServiceApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<ServiceApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            serviceApproveDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

+ 0 - 75
common/src/main/java/com/jpsoft/employment/modules/base/service/impl/UserAuthenticationApproveServiceImpl.java

@@ -1,75 +0,0 @@
-package com.jpsoft.employment.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-
-import com.jpsoft.employment.modules.base.dao.UserAuthenticationApproveDAO;
-import com.jpsoft.employment.modules.base.entity.UserAuthenticationApprove;
-import com.jpsoft.employment.modules.base.service.UserAuthenticationApproveService;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-@Transactional
-@Component(value="userAuthenticationApproveService")
-public class UserAuthenticationApproveServiceImpl implements UserAuthenticationApproveService {
-	@Resource(name="userAuthenticationApproveDAO")
-	private UserAuthenticationApproveDAO userAuthenticationApproveDAO;
-
-	@Override
-	public UserAuthenticationApprove get(String id) {
-		// TODO Auto-generated method stub
-		return userAuthenticationApproveDAO.get(id);
-	}
-
-	@Override
-	public int insert(UserAuthenticationApprove model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return userAuthenticationApproveDAO.insert(model);
-	}
-
-	@Override
-	public int update(UserAuthenticationApprove model) {
-		// TODO Auto-generated method stub
-		return userAuthenticationApproveDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return userAuthenticationApproveDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = userAuthenticationApproveDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<UserAuthenticationApprove> list() {
-		// TODO Auto-generated method stub
-		return userAuthenticationApproveDAO.list();
-	}
-		
-	@Override
-	public Page<UserAuthenticationApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<UserAuthenticationApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            userAuthenticationApproveDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public UserAuthenticationApprove findByUserId(String userId){
-		return userAuthenticationApproveDAO.findByUserId(userId);
-	}
-}

+ 0 - 23
common/src/main/java/com/jpsoft/employment/modules/job/dao/JobUserDAO.java

@@ -1,23 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.JobUser;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository
-public interface JobUserDAO {
-	int insert(JobUser entity);
-	int update(JobUser entity);
-	int clearOpenId(String id);
-	int exist(String id);
-	JobUser get(String id);
-    JobUser findByOpenId(String openId);
-	JobUser findByPhone(String phone);
-	int delete(String id);
-	List<JobUser> list();
-	List<JobUser> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<Map> foundInterestList(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentApproveDAO.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.RecruitmentApprove;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface RecruitmentApproveDAO {
-	int insert(RecruitmentApprove entity);
-	int update(RecruitmentApprove entity);
-	int exist(String id);
-	RecruitmentApprove get(String id);
-	int delete(String id);
-	List<RecruitmentApprove> list();
-	List<RecruitmentApprove> search(Map<String,Object> searchParams,List<Sort> sortList);
-}

+ 0 - 46
common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentCollectionDAO.java

@@ -1,46 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.RecruitmentCollection;
-
-@Repository
-public interface RecruitmentCollectionDAO {
-	int insert(RecruitmentCollection entity);
-	int update(RecruitmentCollection entity);
-	int exist(String id);
-	RecruitmentCollection get(String id);
-	int delete(String id);
-	RecruitmentCollection findByUserIdAndCompanyIdAndResumeId(@Param("userId")String userId,@Param("companyId")String companyId,@Param("resumeid")String resumeid);
-	List<RecruitmentCollection> list();
-	int countByUserId(@Param("companyId")String companyId,@Param("sysUserId")String sysUserId);
-	List<RecruitmentCollection> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-    /**
-     * 招聘方:收藏的简历
-     * @param searchParams
-     * @param sortList
-     * @return
-     */
-    List<Map<String,Object>> pagedLoadCollectResumes(Map<String, Object> searchParams, List<Sort> sortList);
-
-	/**
-	 * 招聘方:招聘主页(显示有效的简历(还未入职的所有简历))
-	 * @param searchParams
-	 * @param sortList
-	 * @return
-	 */
-	List<Map<String,Object>> pagedLoadAllResumes(Map<String, Object> searchParams, List<Sort> sortList);
-	
-	/**
-	 * 招聘方:收藏的简历,取消收藏
-	 * @param resumeId
-	 * @param hrId
-	 * @return
-	 */
-	int updateCancelCollect(@Param("resumeId") String resumeId,@Param("hrId") String hrId);
-}

+ 0 - 59
common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentDAO.java

@@ -1,59 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.RecruitmentVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface RecruitmentDAO {
-	int insert(Recruitment entity);
-	int update(Recruitment entity);
-	int exist(String id);
-	Recruitment get(String id);
-	int delete(String id);
-	List<Recruitment> list();
-	int countByCompanyId(String companyId);
-	List<Recruitment> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-	List<Map> foundPageList(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-    /**
-     * 招聘方职位管理
-     * @param searchParams
-     * @param sortList
-     * @return
-     */
-    List<RecruitmentVO> loadForRecruiter(Map<String, Object> searchParams, List<Sort> sortList);
-
-
-    /**
-     * 统计hr发布的招聘数量、浏览量(不包含已撤销的(已关闭的))
-     * @param hrId
-     * @return
-     */
-    Map<String,Object> rptMyRecruitmentCount(String hrId);
-    
-    /**
-	 * 招聘方职位管理:上下架操作
-	 * @param recruitmentId
-	 * @param publishTag
-	 * @param caller
-	 * @return
-	 */
-	int updateForPublish(@Param("recruitmentId") String recruitmentId,@Param("publishTag") String publishTag,@Param("caller") String caller);
-
-	List<Recruitment> findByCompanyId(String companyId);
-
-	List<Recruitment> listByCompanyId(String companyId);
-
-	List<Recruitment> listByApproved();
-
-	int findNumber(@Param("companyId") String companyId);
-
-	int findPositionNumber(@Param("companyId") String companyId);
-
-	int findSexNumber(@Param("sex")String sex,@Param("companyId") String companyId);
-}

+ 0 - 21
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.Resume;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface ResumeDAO {
-	int insert(Resume entity);
-	int update(Resume entity);
-	int exist(String id);
-	Resume get(String id);
-	int delete(String id);
-	List<Resume> list();
-	List<Resume> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-	Resume findByUserId(String userId);
-	List<Map> foundJobManagement(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-}

+ 0 - 21
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverContentDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.ResumeDeliverContent;
-import org.springframework.stereotype.Repository;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-@Repository
-public interface ResumeDeliverContentDAO {
-	int insert(ResumeDeliverContent entity);
-	int update(ResumeDeliverContent entity);
-	int exist(String id);
-	ResumeDeliverContent get(String id);
-	int delete(String id);
-	List<ResumeDeliverContent> list();
-	List<ResumeDeliverContent> search(Map<String, Object> searchParams, List<Sort> sortList);
-	ResumeDeliverContent findTopByUserId(String userId);
-	ResumeDeliverContent findTopByDeliverId(String deliverId);
-}

+ 0 - 26
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverDAO.java

@@ -1,26 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.ResumeDeliver;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface ResumeDeliverDAO {
-	int insert(ResumeDeliver entity);
-	int update(ResumeDeliver entity);
-	int exist(String id);
-	ResumeDeliver get(String id);
-	int delete(String id);
-	List<ResumeDeliver> list();
-	int countByCompanyId(String companyId);
-	List<ResumeDeliver> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-
-	ResumeDeliver findByUserIdAndRecruitmentId(String userId,String recuitmentId,String chatStatus);
-
-	List<ResumeDeliver> listBySearch(@Param("resumeId")String resumeId,@Param("recruitmentList")List<Recruitment> recruitmentList);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverRecordDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.ResumeDeliverRecord;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface ResumeDeliverRecordDAO {
-	int insert(ResumeDeliverRecord entity);
-	int update(ResumeDeliverRecord entity);
-	int exist(String id);
-	ResumeDeliverRecord get(String id);
-	int delete(String id);
-	List<ResumeDeliverRecord> list();
-	List<ResumeDeliverRecord> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-}

+ 0 - 21
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeEducationExperienceDAO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.ResumeEducationExperience;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface ResumeEducationExperienceDAO {
-	int insert(ResumeEducationExperience entity);
-	int update(ResumeEducationExperience entity);
-	int exist(String id);
-	ResumeEducationExperience get(String id);
-	int delete(String id);
-	List<ResumeEducationExperience> list();
-	List<ResumeEducationExperience> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-	List<ResumeEducationExperience> findByResumeId(String resumeId);
-	int deleteByResumeId(String resumeId);
-}

+ 0 - 23
common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeWorkExperienceDAO.java

@@ -1,23 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.ResumeEducationExperience;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface ResumeWorkExperienceDAO {
-	int insert(ResumeWorkExperience entity);
-	int update(ResumeWorkExperience entity);
-	int exist(String id);
-	ResumeWorkExperience get(String id);
-	int delete(String id);
-	List<ResumeWorkExperience> list();
-	List<ResumeWorkExperience> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-	List<ResumeWorkExperience> findByResumeId(String resumeId);
-	int deleteByResumeId(String resumeId);
-}

+ 0 - 28
common/src/main/java/com/jpsoft/employment/modules/job/dao/UserBrowseDAO.java

@@ -1,28 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.UserBrowse;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface UserBrowseDAO {
-	int insert(UserBrowse entity);
-	int update(UserBrowse entity);
-	int exist(String id);
-	UserBrowse get(String id);
-	int delete(String id);
-	List<UserBrowse> list();
-	List<UserBrowse> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<UserBrowse> searchHR(Map<String, Object> searchParams, List<Sort> sortList);
-	List<Recruitment> loadUserBrowses(Map<String, Object> searchParams, List<Sort> sortList);
-	int findNumberByRId(String recruitmentId);
-
-	int countByCompanyId(String companyId);
-
-	Integer rptUserBrowseCount(String hrId);
-}

+ 0 - 27
common/src/main/java/com/jpsoft/employment/modules/job/dao/UserBrowseHrDAO.java

@@ -1,27 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.UserBrowseHr;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface UserBrowseHrDAO {
-	int insert(UserBrowseHr entity);
-	int update(UserBrowseHr entity);
-	int exist(String id);
-	UserBrowseHr get(String id);
-	int delete(String id);
-	List<UserBrowseHr> list();
-	UserBrowseHr findBySysUserIdAndResumeId(@Param("sysUserId")String sysUserId,@Param("resumeId")String resumeId);
-	List<UserBrowseHr> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-    /**
-     * 统计hr浏览的简历数
-     * @param hrId
-     * @return
-     */
-    Integer rptHrBrowseCount(String hrId);
-	int countBySysUserId(@Param("sysUserId")String sysUserId,@Param("beginTime")String beginTime,@Param("endTime")String endTime);
-}

+ 0 - 24
common/src/main/java/com/jpsoft/employment/modules/job/dao/UserCollectionDAO.java

@@ -1,24 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.UserCollection;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface UserCollectionDAO {
-	int insert(UserCollection entity);
-	int update(UserCollection entity);
-	int exist(String id);
-	UserCollection get(String id);
-	int delete(String id);
-	List<UserCollection> list();
-	List<UserCollection> search(Map<String, Object> searchParams, List<Sort> sortList);
-	UserCollection findByUserIdAndRId(String userId, String recruitmentId);
-	List<UserCollection> findByUserId(String userId);
-	List<Recruitment> loadUserCollection(Map<String, Object> searchParams, List<Sort> sortList);
-}

+ 0 - 22
common/src/main/java/com/jpsoft/employment/modules/job/dao/WorkCategoryDAO.java

@@ -1,22 +0,0 @@
-package com.jpsoft.employment.modules.job.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.employment.modules.job.entity.WorkCategory;
-import java.util.Map;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import org.apache.ibatis.annotations.Param;
-
-@Repository
-public interface WorkCategoryDAO {
-	int insert(WorkCategory entity);
-	int update(WorkCategory entity);
-	int exist(String id);
-	WorkCategory get(String id);
-	int delete(String id);
-	List<WorkCategory> list();
-	List<WorkCategory> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
-	List<WorkCategory> findListByParentId(String parentId);
-
-	List<WorkCategory> findByCompany(String companyId);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/dto/EducationExpDTO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import lombok.Data;
-
-@Data
-public class EducationExpDTO {
-    private String id;
-
-    private String name;
-
-    private String timeS;
-
-    private String timeE;
-
-    private String remark;
-
-    private String content;
-
-}

+ 0 - 14
common/src/main/java/com/jpsoft/employment/modules/job/dto/ExpJsonDTO.java

@@ -1,14 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ExpJsonDTO {
-    private List<WorkExpDTO> workExp;
-    private List<EducationExpDTO> educationExp;
-
-}

+ 0 - 27
common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserDTO.java

@@ -1,27 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class JobUserDTO {
-
-    @ApiModelProperty(value = "入职企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "入职人员姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "身份证号")
-    private String idCard;
-
-    @ApiModelProperty(value = "入职工作地")
-    private String area;
-
-    @ApiModelProperty(value = "入职工作地")
-    private String areaN;
-
-    //只做显示作用不保存数据库
-    private String resumeDeliverId;
-
-}

+ 0 - 70
common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserXlsDTO.java

@@ -1,70 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.employment.modules.job.entity.ResumeEducationExperience;
-import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class JobUserXlsDTO {
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "性别")
-    private String sexN;
-
-    @ApiModelProperty(value = "年龄")
-    private Integer age;
-
-    @ApiModelProperty(value = "出生日期")
-    private String birthday;
-
-    @ApiModelProperty(value = "职位分类")
-    private String positionCategoryName;
-
-    @ApiModelProperty(value = "期望工作地点")
-    private String dreamAdd;
-
-    @ApiModelProperty(value = "期望薪资")
-    private String dreamMoneyName;
-
-    @ApiModelProperty(value = "工作经验")
-    private String workExpName;
-
-    @ApiModelProperty(value = "手机")
-    private String tel;
-
-    @ApiModelProperty(value = "现居住地")
-    private String address;
-
-    @ApiModelProperty(value = "现工作单位")
-    private String curCompany;
-
-    @ApiModelProperty(value = "学历")
-    private String educationName;
-
-    @ApiModelProperty(value = "学校名称")
-    private String schoolName;
-
-    @ApiModelProperty(value = "专业")
-    private String major;
-
-    @ApiModelProperty(value = "应聘日期")
-    private String applyDate;
-
-    @ApiModelProperty(value = "个人介绍")
-    private String introduction;
-
-    @ApiModelProperty(value = "工作经历")
-    private List<ResumeWorkExperience> workList;
-
-    @ApiModelProperty(value = "教育经历")
-    private List<ResumeEducationExperience> educateList;
-
-}

+ 0 - 61
common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverDTO.java

@@ -1,61 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.employment.modules.sys.entity.DataDictionary;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ResumeDeliverDTO {
-
-    @ApiModelProperty(value = "ID")
-    private String id;
-
-    @ApiModelProperty(value = "人员ID")
-    private String jobUserId;
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "应聘职位")
-    private String position;
-
-    @ApiModelProperty(value = "求职人数")
-    private Integer positionNumber;
-
-    @ApiModelProperty(value = "期望薪资")
-    private String dreamMoney;
-
-    @ApiModelProperty(value = "工作经验")
-    private String workExp;
-
-    @ApiModelProperty(value = "学历")
-    private String education;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-    @ApiModelProperty(value = "出生日期")
-    private Date birthday;
-
-    @ApiModelProperty(value = "工作状态(是否上班")
-    private String jobStatus;
-
-    @ApiModelProperty(value = "工作状态(是否上班")
-    private String jobStatusN;
-
-    @ApiModelProperty(value = "沟通状态")
-    private String chatStatus;
-
-    @ApiModelProperty(value = "沟通状态")
-    private String chatStatusN;
-
-    @ApiModelProperty(value = "附件,逗号分割")
-    private String resumeUrls;
-
-
-    private List<DataDictionary> chatStatusList;
-}

+ 0 - 67
common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverHrDTO.java

@@ -1,67 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ResumeDeliverHrDTO {
-
-    @ApiModelProperty(value = "ID")
-    private String id;
-
-    @ApiModelProperty(value = "人员ID")
-    private String jobUserId;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "应聘职位")
-    private String positionName;
-
-    @ApiModelProperty(value = "头像")
-    private String headImageUrl;
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "性别")
-    private String sexN;
-
-    @ApiModelProperty(value = "年龄")
-    private Integer age;
-
-    @ApiModelProperty(value = "工作经验")
-    private String workExp;
-
-    @ApiModelProperty(value = "学历")
-    private String education;
-
-    @ApiModelProperty(value = "期望薪资")
-    private String dreamMoney;
-
-    @ApiModelProperty(value = "联系方式")
-    private String userTel;
-
-    @ApiModelProperty(value = "工作经历")
-    private List<ResumeWorkExperience> resumeWorkExperienceList;
-
-    @ApiModelProperty(value = "简历ID")
-    private String resumeId;
-
-    @ApiModelProperty(value = "附件,逗号分割")
-    private String resumeUrls;
-
-    @ApiModelProperty(value = "期望工作地")
-    private String dreamAdd;
-
-    @ApiModelProperty(value = "工作状态")
-    private String jobStatus;
-}

+ 0 - 25
common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverRecordDTO.java

@@ -1,25 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ResumeDeliverRecordDTO {
-
-    private String id;
-    private String chatType;
-    private Date chatDate;
-    private String chatTime;
-    private String remark;
-    private String resumeDeliverId;
-    private String resumeId;
-    private String recruitmentId;
-
-    @ApiModelProperty(value = "联系人")
-    private String realName;
-    @ApiModelProperty(value = "联系方式")
-    private String companyPhone;
-
-}

+ 0 - 55
common/src/main/java/com/jpsoft/employment/modules/job/dto/TalentPoolDTO.java

@@ -1,55 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TalentPoolDTO {
-
-    @ApiModelProperty(value = "ID")
-    private String Id;
-
-    @ApiModelProperty(value = "简历ID")
-    private String resumeId;
-
-    @ApiModelProperty(value = "头像")
-    private String headImageUrl;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "性别")
-    private String sex;
-
-    @ApiModelProperty(value = "年龄")
-    private Integer age;
-
-    @ApiModelProperty(value = "学历")
-    private String educationName;
-
-    @ApiModelProperty(value = "工作经验")
-    private String workExpName;
-
-    @ApiModelProperty(value = "期望职位")
-    private String positionCategoryName;
-
-    @ApiModelProperty(value = "期望薪资")
-    private String dreamMoneyName;
-
-    @ApiModelProperty(value = "工作状态")
-    private String jobStatus;
-
-    @ApiModelProperty(value = "期望工作地点")
-    private String dreamAdd;
-
-    @ApiModelProperty(value = "个人介绍")
-    private String introduction;
-
-    @ApiModelProperty(value = "工作经历")
-    private List<ResumeWorkExperience> resumeWorkExperienceList;
-
-
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/dto/WorkExpDTO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import lombok.Data;
-
-@Data
-public class WorkExpDTO {
-    private String id;
-
-    private String name;
-
-    private String timeS;
-
-    private String timeE;
-
-    private String remark;
-
-    private String content;
-
-}

+ 0 - 12
common/src/main/java/com/jpsoft/employment/modules/job/dto/WorkStepDTO.java

@@ -1,12 +0,0 @@
-package com.jpsoft.employment.modules.job.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class WorkStepDTO {
-    private Integer sortNo;
-    private String text;
-    private String date;
-}

+ 0 - 10
common/src/main/java/com/jpsoft/employment/modules/job/entity/ApproveStatusConstant.java

@@ -1,10 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-public class ApproveStatusConstant {
-
-	public static final String UNCREATE="1";  //未创建
-	
-	public static final String APPROVING="2";  //审批中
-	
-	public static final String FINISH="3";  // 已审批
-}

+ 0 - 88
common/src/main/java/com/jpsoft/employment/modules/job/entity/JobUser.java

@@ -1,88 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
-  描述:job_user的实体类
- */
-@Data
-public class JobUser {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-
-	@ApiModelProperty(value = "用户名")
-	private String userName;
-
-	@ApiModelProperty(value = "密码")
-	private String password;
-
-	@ApiModelProperty(value = "真实姓名")
-	private String realName;
-
-	@ApiModelProperty(value = "微信唯一标识")
-	private String openId;
-
-	@ApiModelProperty(value = "手机号")
-	private String tel;
-
-	@ApiModelProperty(value = "性别")
-	private String sex;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	@ApiModelProperty(value = "出生日期")
-	private Date birthday;
-
-	@ApiModelProperty(value = "现居地")
-	private String address;
-
-	@ApiModelProperty(value = "首次参加工作时间")
-	private String firstJobTime;
-
-	@ApiModelProperty(value = "头像")
-	private String headImageUrl;
-
-	@ApiModelProperty(value = "是否认证")
-	private String isAuthentication;
-
-	@ApiModelProperty(value = "身份证号")
-	private String idCard;
-
-	@ApiModelProperty(value = "身份证照片")
-	private String idCardUrl;
-	private String[] idCardUrlArray;
-
-	@ApiModelProperty(value = "工作状态")
-	private String jobStatus;
-
-}

+ 0 - 105
common/src/main/java/com/jpsoft/employment/modules/job/entity/Recruitment.java

@@ -1,105 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.jpsoft.employment.modules.sys.entity.DataDictionary;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:job_recruitment的实体类
- */
-@Data
-@ApiModel(value = "job_recruitment的实体类")
-public class Recruitment {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "企业ID ")
-    private String companyId;
-    private String companyName;
-    private String companyLogo;
-    private String companyScale;
-    private String companyScaleN;
-    private String companyIndustry;
-    private String companyIndustryN;
-    private String isCertification;//是否认证企业
-        @ApiModelProperty(value = "标题")
-    private String title;
-        @ApiModelProperty(value = "招聘所属地区")
-    private String area;
-    @ApiModelProperty(value = "招聘所属地区翻译")
-    private String areaN;
-        @ApiModelProperty(value = "地址")
-    private String address;
-        @ApiModelProperty(value = "职位")
-    private String position;
-    private String positionName;
-        @ApiModelProperty(value = "职位描述")
-    private String positionMessage;
-        @ApiModelProperty(value = "任职要求")
-    private String requirements;
-        @ApiModelProperty(value = "求职人数")
-    private Integer positionNumber;
-        @ApiModelProperty(value = "工作年限")
-    private String workYear;
-    private String workYearName;
-        @ApiModelProperty(value = "学历要求")
-    private String education;
-    private String educationName;
-        @ApiModelProperty(value = "性别要求")
-    private String positionSex;
-    private String positionSexN;
-        @ApiModelProperty(value = "")
-    private Integer readTimes;
-        @ApiModelProperty(value = "薪资")
-    private String wageType;
-    private String wageTypeName;
-        @ApiModelProperty(value = "是否面议")
-    private Boolean isDiscussPersonally;
-        @ApiModelProperty(value = "联系人")
-    private String contactPerson;
-        @ApiModelProperty(value = "联系方式")
-    private String tel;
-        @ApiModelProperty(value = "状态(关闭,开启等)")
-    private String status;
-        @ApiModelProperty(value = "审批状态")
-    private String approveStatus;
-        @ApiModelProperty(value = "阅读次数")
-    private Integer readingTimes;
-        @ApiModelProperty(value = "收藏次数")
-    private Integer collectionTimes;
-        @ApiModelProperty(value = "投递次数")
-    private Integer deliveryTimes;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-    @ApiModelProperty(value = "岗位分类ID")
-    private String workCategoryId;
-    @ApiModelProperty(value = "福利待遇")
-    private String welfare;
-
-
-    @ApiModelProperty(value = "福利待遇(不保存数据库作显示用)")
-    private String dynamicTags;
-    private String checkboxGroup1;
-
-    private List<String> tagList;
-}

+ 0 - 49
common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentApprove.java

@@ -1,49 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:job_recruitment_approve的实体类
- */
-@Data
-@ApiModel(value = "job_recruitment_approve的实体类")
-public class RecruitmentApprove {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-    private String createByName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "岗位认证ID")
-    private String recruitmentId;
-    private String recruitmentName;
-        @ApiModelProperty(value = "审批人")
-    private String approvePersonId;
-    private String approvePersonName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "审批时间")
-    private Date approveTime;
-    @ApiModelProperty(value = "审批状态")
-    private String approveStatus;
-    private String approveStatusName;
-}

+ 0 - 50
common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentCollection.java

@@ -1,50 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_recruitment_collection的实体类
- */
-@Data
-public class RecruitmentCollection {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "所属企业")
-	private String companyId;
-
-	@ApiModelProperty(value = "招聘方用户ID")
-	private String sysUserId;
-
-	@ApiModelProperty(value = "简历ID")
-	private String resumeId;
-
-}

+ 0 - 105
common/src/main/java/com/jpsoft/employment/modules/job/entity/RecruitmentVO.java

@@ -1,105 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
-  描述:job_recruitment的VO
- */
-@Data
-public class RecruitmentVO {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "企业ID")
-	private String companyId;
-
-	@ApiModelProperty(value = "标题")
-	private String title;
-
-	@ApiModelProperty(value = "招聘所属地区")
-	private String area;
-
-	@ApiModelProperty(value = "地址")
-	private String address;
-
-	@ApiModelProperty(value = "职位")
-	private String position;
-
-	@ApiModelProperty(value = "职位名称")
-	private String positionName;
-
-	@ApiModelProperty(value = "职位描述")
-	private String positionMessage;
-
-	@ApiModelProperty(value = "任职要求")
-	private String requirements;
-
-
-	@ApiModelProperty(value = "求职人数")
-	private Integer positionNumber;
-
-	@ApiModelProperty(value = "工作年限")
-	private String workYear;
-
-	@ApiModelProperty(value = "学历要求")
-	private String education;
-
-	@ApiModelProperty(value = "性别要求")
-	private String positionSex;
-
-	@ApiModelProperty(value = "性别要求")
-	private Integer readTimes;
-
-	@ApiModelProperty(value = "薪资")
-	private String wageType;
-
-	@ApiModelProperty(value = "是否面议")
-	private Boolean isDiscussPersonally;
-
-	@ApiModelProperty(value = "联系人")
-	private String contactPerson;
-
-	@ApiModelProperty(value = "联系方式")
-	private String tel;
-
-	@ApiModelProperty(value = "状态(关闭,开启等)")
-	private String status;
-
-	@ApiModelProperty(value = "审批状态")
-	private String approveStatus;
-
-	@ApiModelProperty(value = "阅读次数")
-	private Integer readingTimes;
-
-	@ApiModelProperty(value = "收藏次数")
-	private Integer collectionTimes;
-
-	@ApiModelProperty(value = "投递次数")
-	private Integer deliveryTimes;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-}

+ 0 - 119
common/src/main/java/com/jpsoft/employment/modules/job/entity/Resume.java

@@ -1,119 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.jpsoft.employment.modules.job.dto.WorkStepDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_resume的实体类
- */
-@Data
-public class Resume {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "用户ID")
-	private String jobUserId;
-
-	@ApiModelProperty(value = "性别")
-	private String sex;
-	private String sexName;
-
-	@ApiModelProperty(value = "职位分类")
-	private String positionCategoryId;
-	private String positionCategoryName;
-
-	@ApiModelProperty(value = "工作经验")
-	private String workExp;
-	private String workExpName;
-
-	@ApiModelProperty(value = "学历")
-	private String education;
-	private String educationName;
-
-	@ApiModelProperty(value = "期望薪资")
-	private String dreamMoney;
-	private String dreamMoneyName;
-
-	@ApiModelProperty(value = "期望工作地点")
-	private String dreamAdd;
-	@ApiModelProperty(value = "期望工作地点翻译")
-	private String dreamAddName;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	@ApiModelProperty(value = "出生日期")
-	private Date birthday;
-
-	@ApiModelProperty(value = "个人介绍")
-	private String introduction;
-
-
-	@ApiModelProperty(value = "简历状态(上下架)")
-	private String status;
-	private String statusName;
-
-	@ApiModelProperty(value = "审批状态")
-	private String approveStatus;
-
-	@ApiModelProperty(value = "工作状态(字典:工作在职状态")
-	private String jobStatus;
-	private String jobStatusName;
-
-	@ApiModelProperty(value = "附件,逗号分割")
-	private String resumeUrls;
-
-	@ApiModelProperty(value = "照片-head_image_url")
-	private String userPhoto;
-	@ApiModelProperty(value = "姓名-real_name")
-	private String userName;
-	@ApiModelProperty(value = "实名制状态-is_authentication")
-	private String userIsAuthentication;
-	private String userIsAuthenticationName;
-	@ApiModelProperty(value = "身份证号")
-	private String userIdCard;
-	@ApiModelProperty(value = "年龄")
-	private String userAge;
-	@ApiModelProperty(value = "地址")
-	private String userAddress;
-	@ApiModelProperty(value = "联系方式")
-	private String userTel;
-	@ApiModelProperty(value = "阅读次数")
-	private Integer readingTimes;
-	@ApiModelProperty(value = "收藏次数")
-	private Integer collectionTimes;
-	@ApiModelProperty(value = "工作经历")
-	private List<ResumeWorkExperience> workList;
-	@ApiModelProperty(value = "教育经历")
-	private List<ResumeEducationExperience> educateList;
-	@ApiModelProperty(value = "教育经历")
-	private List<WorkStepDTO> workStepList;
-}

+ 0 - 65
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliver.java

@@ -1,65 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_resume_deliver的实体类
- */
-@Data
-public class ResumeDeliver {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-
-	@ApiModelProperty(value = "用户ID")
-	private String jobUserId;
-
-	@ApiModelProperty(value = "简历ID")
-	private String jobResumeId;
-
-	@ApiModelProperty(value = "招聘ID")
-	private String jobRecruitmentId;
-
-	@ApiModelProperty(value = "投递的招聘信息")
-	private Recruitment jobRecruitment;
-
-	@ApiModelProperty(value = "废弃")
-	private String status;
-
-	@ApiModelProperty(value = "沟通状态")
-	private String chatStatus;
-
-	@ApiModelProperty(value = "投递用户的姓名")
-	private String jobUserName;
-
-	@ApiModelProperty(value = "投递用户的性别")
-	private String jobUserSex;
-}

+ 0 - 61
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverContent.java

@@ -1,61 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:job_resume_deliver_content的实体类
- */
-@Data
-@ApiModel(value = "job_resume_deliver_content的实体类")
-public class ResumeDeliverContent {
-        @ApiModelProperty(value = "")
-    private String id;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "投递表ID")
-    private String deliverId;
-        @ApiModelProperty(value = "沟通状态")
-    private String chatStatus;
-        @ApiModelProperty(value = "日期")
-    private String todoTime;
-        @ApiModelProperty(value = "时分秒-起")
-    private String todoMinuteStart;
-        @ApiModelProperty(value = "时分秒-止")
-    private String todoMinuteEnd;
-        @ApiModelProperty(value = "地点")
-    private String address;
-        @ApiModelProperty(value = "入职岗位")
-    private String entryPost;
-        @ApiModelProperty(value = "入职职位")
-    private String entryDepartment;
-        @ApiModelProperty(value = "备注-拒绝原因")
-    private String remark;
-    @ApiModelProperty(value = "用户ID")
-    private String jobUserId;
-
-    @ApiModelProperty(value = "简历ID")
-    private String jobResumeId;
-
-    @ApiModelProperty(value = "招聘ID")
-    private String jobRecruitmentId;
-}

+ 0 - 91
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverRecord.java

@@ -1,91 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_resume_deliver_record的实体类
- */
-@Data
-public class ResumeDeliverRecord {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@ApiModelProperty(value = "创建人")
-	private String createByN;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "投递情况记录的ID")
-	private String resumeDeliverId;
-
-	@ApiModelProperty(value = "操作记录")
-	private String step;
-
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-
-	//以下字段作为显示使用不存入数据库
-	@ApiModelProperty(value = "日期")
-	private String ChatDateStr;
-
-	@ApiModelProperty(value = "开始时间")
-	private String beginTime;
-
-	@ApiModelProperty(value = "结束时间")
-	private String endTime;
-
-
-	@ApiModelProperty(value = "用户Id")
-	private String jobUserId;
-
-    @ApiModelProperty(value = "岗位")
-    private String entryPosition;
-
-    @ApiModelProperty(value = "部门")
-    private String entryDepartment;
-
-	@ApiModelProperty(value = "简历ID,用于显示,不保存数据库")
-    private String resumeId;
-
-	@ApiModelProperty(value = "招聘ID,用于显示,不保存数据库")
-	private String recruitmentId;
-
-
-	@ApiModelProperty(value = "联系人")
-	private String realName;
-	@ApiModelProperty(value = "联系方式")
-	private String companyPhone;
-
-	@ApiModelProperty(value = "备注面试时间")
-	private String remarkN;
-
-	@ApiModelProperty(value = "备注面试地点")
-	private String remarkAddress;
-}

+ 0 - 62
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeEducationExperience.java

@@ -1,62 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_resume_education_experience的实体类
- */
-@Data
-public class ResumeEducationExperience {
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "简历ID")
-	private String resumeId;
-
-	@ApiModelProperty(value = "排序号")
-	private Integer sortNo;
-
-
-	@ApiModelProperty(value = "在校时间-起")
-	private String startTime;
-
-	@ApiModelProperty(value = "在校时间-止")
-	private String endTime;
-
-	@ApiModelProperty(value = "学校名称")
-	private String schoolName;
-
-	@ApiModelProperty(value = "学历")
-	private String education;
-
-	@ApiModelProperty(value = "专业")
-	private String major;
-
-}

+ 0 - 77
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeVO.java

@@ -1,77 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
-  描述:job_resume的VO类
- */
-@Data
-public class ResumeVO {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "用户ID")
-	private String jobUserId;
-
-	@ApiModelProperty(value = "性别")
-	private String sex;
-
-	@ApiModelProperty(value = "职位分类")
-	private String positionCategoryId;
-
-	@ApiModelProperty(value = "职位分类名称")
-	private String positionCategoryName;
-
-	@ApiModelProperty(value = "工作经验")
-	private String workExp;
-
-	@ApiModelProperty(value = "学历")
-	private String education;
-
-	@ApiModelProperty(value = "期望薪资")
-	private String dreamMoney;
-
-	@ApiModelProperty(value = "期望工作地点")
-	private String dreamAdd;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	@ApiModelProperty(value = "出生日期")
-	private Date birthday;
-
-	@ApiModelProperty(value = "个人介绍")
-	private String introduction;
-
-
-	@ApiModelProperty(value = "简历状态(开启,审核,等")
-	private String status;
-
-	@ApiModelProperty(value = "审批状态")
-	private String approveStatus;
-
-}

+ 0 - 62
common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeWorkExperience.java

@@ -1,62 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_resume_work_experience的实体类
- */
-@Data
-public class ResumeWorkExperience {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "简历ID")
-	private String resumeId;
-
-	@ApiModelProperty(value = "排序号")
-	private Integer sortNo;
-
-	@ApiModelProperty(value = "工作年限-起")
-	private String startTime;
-
-	@ApiModelProperty(value = "工作年限-止")
-	private String endTime;
-
-	@ApiModelProperty(value = "工作企业")
-	private String companyName;
-
-	@ApiModelProperty(value = "工作职位")
-	private String job;
-
-	@ApiModelProperty(value = "工作内容")
-	private String content;
-
-}

+ 0 - 46
common/src/main/java/com/jpsoft/employment/modules/job/entity/UserBrowse.java

@@ -1,46 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_user_browse的实体类
- */
-@Data
-public class UserBrowse {
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "用户ID")
-	private String jobUserId;
-
-	@ApiModelProperty(value = "招聘ID")
-	private String jobRecruitmentId;
-
-}

+ 0 - 46
common/src/main/java/com/jpsoft/employment/modules/job/entity/UserBrowseHr.java

@@ -1,46 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_user_browse_hr的实体类
- */
-@Data
-public class UserBrowseHr {
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-	@ApiModelProperty(value = "HR用户ID")
-	private String sysUserId;
-
-	@ApiModelProperty(value = "招聘ID")
-	private String jobResumeId;
-
-}

+ 0 - 47
common/src/main/java/com/jpsoft/employment/modules/job/entity/UserCollection.java

@@ -1,47 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
-  描述:job_user_collection的实体类
- */
-@Data
-public class UserCollection {
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
-
-	@ApiModelProperty(value = "用户ID")
-	private String jobUserId;
-
-	@ApiModelProperty(value = "招聘ID")
-	private String jobRecruitmentId;
-
-}

+ 0 - 51
common/src/main/java/com/jpsoft/employment/modules/job/entity/WorkCategory.java

@@ -1,51 +0,0 @@
-package com.jpsoft.employment.modules.job.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:job_work_category的实体类
- */
-@Data
-@ApiModel(value = "job_work_category的实体类")
-public class WorkCategory {
-        @ApiModelProperty(value = "ID")
-    private String id;
-        @ApiModelProperty(value = "名称")
-    private String name;
-        @ApiModelProperty(value = "父ID")
-    private String parentId;
-        @ApiModelProperty(value = "排序")
-    private Integer sortNo;
-        @ApiModelProperty(value = "编码")
-    private String code;
-        @ApiModelProperty(value = "")
-    private String quickLog;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "删除标示")
-    private Boolean delFlag;
-        @ApiModelProperty(value = "级别")
-    private Integer level;
-    @ApiModelProperty(value = "+子级")
-    private List<WorkCategory> children;
-}

+ 0 - 22
common/src/main/java/com/jpsoft/employment/modules/job/service/JobUserService.java

@@ -1,22 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.JobUser;
-
-import java.util.List;
-import java.util.Map;
-
-public interface JobUserService {
-	JobUser get(String id);
-	boolean exist(String id);
-	int insert(JobUser model);
-	int update(JobUser model);
-	int delete(String id);
-	int clearOpenId(String id);
-    JobUser findByOpenId(String openId);
-	JobUser findByPhone(String phone);
-	List<JobUser> list();
-	Page<JobUser> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<Map> foundInterestList(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 17
common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentApproveService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.RecruitmentApprove;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface RecruitmentApproveService {
-	RecruitmentApprove get(String id);
-	boolean exist(String id);
-	int insert(RecruitmentApprove model);
-	int update(RecruitmentApprove model);
-	int delete(String id);
-	List<RecruitmentApprove> list();
-	Page<RecruitmentApprove> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

+ 0 - 50
common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentCollectionService.java

@@ -1,50 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.RecruitmentCollection;
-
-public interface RecruitmentCollectionService {
-	RecruitmentCollection get(String id);
-	boolean exist(String id);
-	int insert(RecruitmentCollection model);
-	int update(RecruitmentCollection model);
-	int delete(String id);
-	int countByUserId(String companyId,String sysUserId);
-	RecruitmentCollection findByUserIdAndCompanyIdAndResumeId(String userId,String companyId,String resumeid);
-	List<RecruitmentCollection> list();
-	Page<RecruitmentCollection> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-	/**
-	 * 招聘方:收藏的简历
-	 * @param searchParams
-	 * @param pageNumber
-	 * @param pageSize
-	 * @param count
-	 * @param sortList
-	 * @return
-	 */
-	Page<Map<String,Object>> pagedLoadCollectResumes(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList);
-
-	/**
-	 * 招聘方:招聘主页(所有为入职的简历)
-	 * @param searchParams
-	 * @param pageNumber
-	 * @param pageSize
-	 * @param count
-	 * @param sortList
-	 * @return
-	 */
-	Page<Map<String,Object>> pagedLoadAllResumes(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList);
-	
-	/**
-	 * 招聘方:收藏的简历,取消收藏
-	 * @param resumeId
-	 * @param hrId
-	 * @return
-	 */
-	boolean updateCancelCollect(String resumeId,String hrId);
-}

+ 0 - 60
common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentService.java

@@ -1,60 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.RecruitmentVO;
-
-public interface RecruitmentService {
-	Recruitment get(String id);
-	boolean exist(String id);
-	int insert(Recruitment model);
-	int update(Recruitment model);
-	int delete(String id);
-	List<Recruitment> list();
-	int countByCompanyId(String companyId);
-	Page<Recruitment> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<Map> foundPageList(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-	/**
-	 * 招聘方职位管理
-	 * @param searchParams
-	 * @param pageNum
-	 * @param pageSize
-	 * @param count
-	 * @param sortList
-	 * @return
-	 */
-	Page<RecruitmentVO> loadForRecruiter(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-	/**
-	 * 统计hr发布的招聘数量、浏览量(不包含已撤销的(已关闭的))
-	 * @param hrId
-	 * @return
-	 */
-	Map<String,Object> rptMyRecruitmentCount(String hrId);
-	
-	/**
-	 * 招聘方职位管理:上下架操作
-	 * @param recruitmentId
-	 * @param publishTag
-	 * @param caller
-	 * @return
-	 */
-	boolean updateForPublish(String recruitmentId,String publishTag,String caller);
-
-	List<Recruitment> findByCompanyId(String companyId);
-
-	List<Recruitment> listByCompanyId(String companyId);
-
-	List<Recruitment> listByApproved();
-
-	int findNumber(String companyId);
-
-	int findPositionNumber(String companyId);
-
-	int findSexNumber(String sex,String companyId);
-
-}

+ 0 - 20
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverContentService.java

@@ -1,20 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.base.entity.MessageNotice;
-import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.job.entity.ResumeDeliverContent;
-
-public interface ResumeDeliverContentService {
-	ResumeDeliverContent get(String id);
-	boolean exist(String id);
-	int insert(ResumeDeliverContent model);
-	int update(ResumeDeliverContent model);
-	int delete(String id);
-	List<ResumeDeliverContent> list();
-	Page<ResumeDeliverContent> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	ResumeDeliverContent findTopByUserId(String userId);
-	ResumeDeliverContent findTopByDeliverId(String deliverId);
-}

+ 0 - 18
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverRecordService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.ResumeDeliverRecord;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeDeliverRecordService {
-	ResumeDeliverRecord get(String id);
-	boolean exist(String id);
-	int insert(ResumeDeliverRecord model);
-	int insertAndResumeDeliver(ResumeDeliverRecord model,String chatType);
-	int update(ResumeDeliverRecord model);
-	int delete(String id);
-	List<ResumeDeliverRecord> list();
-	Page<ResumeDeliverRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 27
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverService.java

@@ -1,27 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import com.jpsoft.employment.modules.job.entity.ResumeDeliver;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeDeliverService {
-	ResumeDeliver get(String id);
-	boolean exist(String id);
-	int insert(ResumeDeliver model);
-	int update(ResumeDeliver model);
-	int delete(String id);
-	List<ResumeDeliver> list();
-	int countByCompanyId(String companyId);
-	Page<ResumeDeliver> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-	ResumeDeliver findByUserIdAndRecruitmentId(String userId,String recuitmentId,String chatStatus);
-
-
-	List<ResumeDeliver> listBySearch(String resumeId,List<Recruitment> recruitmentList);
-
-
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeEducationExperienceService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.ResumeEducationExperience;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeEducationExperienceService {
-	ResumeEducationExperience get(String id);
-	boolean exist(String id);
-	int insert(ResumeEducationExperience model);
-	int update(ResumeEducationExperience model);
-	int delete(String id);
-	List<ResumeEducationExperience> list();
-	Page<ResumeEducationExperience> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<ResumeEducationExperience> findByResumeId(String resumeId);
-	int deleteByResumeId(String resumeId);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.Resume;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeService {
-	Resume get(String id);
-	boolean exist(String id);
-	int insert(Resume model);
-	int update(Resume model);
-	int delete(String id);
-	List<Resume> list();
-	Page<Resume> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Resume findByUserId(String userId);
-	Page<Map> foundJobManagement(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-}

+ 0 - 19
common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeWorkExperienceService.java

@@ -1,19 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface ResumeWorkExperienceService {
-	ResumeWorkExperience get(String id);
-	boolean exist(String id);
-	int insert(ResumeWorkExperience model);
-	int update(ResumeWorkExperience model);
-	int delete(String id);
-	List<ResumeWorkExperience> list();
-	Page<ResumeWorkExperience> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	List<ResumeWorkExperience> findByResumeId(String resumeId);
-	int deleteByResumeId(String resumeId);
-}

+ 0 - 26
common/src/main/java/com/jpsoft/employment/modules/job/service/UserBrowseHrService.java

@@ -1,26 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.employment.modules.job.entity.UserBrowseHr;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface UserBrowseHrService {
-	UserBrowseHr get(String id);
-	boolean exist(String id);
-	int insert(UserBrowseHr model);
-	int update(UserBrowseHr model);
-	int delete(String id);
-	List<UserBrowseHr> list();
-	UserBrowseHr findBySysUserIdAndResumeId(String sysUserId,String resumeId);
-	Page<UserBrowseHr> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	/**
-	 * 统计hr浏览的简历数
-	 * @param hrId
-	 * @return
-	 */
-	Integer rptHrBrowseCount(String hrId);
-
-	int countBySysUserId(String sysUserId,String beginTime,String endTime);
-}

+ 0 - 25
common/src/main/java/com/jpsoft/employment/modules/job/service/UserBrowseService.java

@@ -1,25 +0,0 @@
-package com.jpsoft.employment.modules.job.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.jpsoft.employment.modules.job.entity.Recruitment;
-import com.jpsoft.employment.modules.job.entity.UserBrowse;
-import com.github.pagehelper.Page;
-import com.jpsoft.employment.modules.common.dto.Sort;
-
-public interface UserBrowseService {
-	UserBrowse get(String id);
-	boolean exist(String id);
-	int insert(UserBrowse model);
-	int update(UserBrowse model);
-	int delete(String id);
-	int findNumberByRId(String recruitmentId);
-	int countByCompanyId(String companyId);
-	List<UserBrowse> list();
-	Page<UserBrowse> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<UserBrowse> pageSearchHR(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-	Page<Recruitment> loadUserBrowses(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
-	Integer rptUserBrowseCount(String hrId);
-}

Some files were not shown because too many files changed in this diff