Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/dao/CompanyDAO.java

@@ -16,4 +16,6 @@ public interface CompanyDAO {
 	int delete(String id);
 	List<Company> list();
 	List<Company> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	List<Company> findByAll();
 }

common/src/main/java/com/jpsoft/employment/modules/base/entity/Company.java

@@ -85,4 +85,9 @@ public class Company {
     private Integer city;
     @ApiModelProperty(value = "区")
     private Integer zone;
+
+    @ApiModelProperty(value = "招聘岗位数")
+    private Integer postNum;
+    @ApiModelProperty(value = "招聘人数")
+    private Integer peopleNum;
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/CompanyService.java

@@ -14,4 +14,5 @@ public interface CompanyService {
 	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();
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CompanyServiceImpl.java

@@ -69,4 +69,9 @@ public class CompanyServiceImpl implements CompanyService {
         
         return page;
 	}
+
+	@Override
+	public List<Company> findByAll(){
+		return companyDAO.findByAll();
+	}
 }

common/src/main/java/com/jpsoft/employment/modules/job/dao/RecruitmentDAO.java

@@ -46,4 +46,14 @@ public interface RecruitmentDAO {
 	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);
 }

common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverContentDAO.java

@@ -17,4 +17,5 @@ public interface ResumeDeliverContentDAO {
 	List<ResumeDeliverContent> list();
 	List<ResumeDeliverContent> search(Map<String, Object> searchParams, List<Sort> sortList);
 	ResumeDeliverContent findTopByUserId(String userId);
+	ResumeDeliverContent findTopByDeliverId(String deliverId);
 }

common/src/main/java/com/jpsoft/employment/modules/job/dao/WorkCategoryDAO.java

@@ -17,4 +17,6 @@ public interface WorkCategoryDAO {
 	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);
 }

common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliver.java

@@ -57,4 +57,9 @@ public class ResumeDeliver {
 	@ApiModelProperty(value = "沟通状态")
 	private String chatStatus;
 
+	@ApiModelProperty(value = "投递用户的姓名")
+	private String jobUserName;
+
+	@ApiModelProperty(value = "投递用户的性别")
+	private String jobUserSex;
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/RecruitmentService.java

@@ -46,4 +46,15 @@ public interface RecruitmentService {
 	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);
+
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverContentService.java

@@ -16,4 +16,5 @@ public interface ResumeDeliverContentService {
 	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);
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/WorkCategoryService.java

@@ -15,4 +15,6 @@ public interface WorkCategoryService {
 	List<WorkCategory> list();
 	Page<WorkCategory> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	List<WorkCategory> findListByParentId(String parentId);
+
+	List<WorkCategory> findByCompany(String companyId);
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/RecruitmentServiceImpl.java

@@ -141,4 +141,29 @@ public class RecruitmentServiceImpl implements RecruitmentService {
 		return recruitmentDAO.findByCompanyId(companyId);
 	}
 
+	@Override
+	public List<Recruitment> listByCompanyId(String companyId){
+		return recruitmentDAO.listByCompanyId(companyId);
+	}
+
+	@Override
+	public List<Recruitment> listByApproved(){
+		return recruitmentDAO.listByApproved();
+	}
+
+	@Override
+	public int findNumber(String companyId){
+		return recruitmentDAO.findNumber(companyId);
+	}
+
+	@Override
+	public int findPositionNumber(String companyId){
+		return recruitmentDAO.findPositionNumber(companyId);
+	}
+
+	@Override
+	public int findSexNumber(String sex,String companyId){
+		return recruitmentDAO.findSexNumber(sex,companyId);
+	}
+
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverContentServiceImpl.java

@@ -73,4 +73,9 @@ public class ResumeDeliverContentServiceImpl implements ResumeDeliverContentServ
 	public ResumeDeliverContent findTopByUserId(String userId){
 		return resumeDeliverContentDAO.findTopByUserId(userId);
 	}
+
+	@Override
+	public ResumeDeliverContent findTopByDeliverId(String deliverId){
+		return resumeDeliverContentDAO.findTopByDeliverId(deliverId);
+	}
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/WorkCategoryServiceImpl.java

@@ -73,4 +73,9 @@ public class WorkCategoryServiceImpl implements WorkCategoryService {
 		// TODO Auto-generated method stub
 		return workCategoryDAO.findListByParentId(parentId);
 	}
+
+	@Override
+	public List<WorkCategory> findByCompany(String companyId){
+		return workCategoryDAO.findByCompany(companyId);
+	}
 }

common/src/main/java/com/jpsoft/employment/modules/manage/dao/DeviceConfigurationDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairAdmissionDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairCompanyDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDeliverRecordDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/SeatManageApproveDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/dao/SeatManageDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/manage/entity/DeviceConfiguration.java

@@ -0,0 +1,51 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_device_configuration的实体类
+ */
+@Data
+@ApiModel(value = "manage_device_configuration的实体类")
+public class DeviceConfiguration {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "大门欢迎语")
+    private String dmWelcomeWords;
+        @ApiModelProperty(value = "当前招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "大厅模板(字典表,欢迎语1,可视化2,数据统计3)")
+    private String dtTemplate;
+        @ApiModelProperty(value = "大厅欢迎语")
+    private String dtWelcomeWords;
+        @ApiModelProperty(value = "大厅背景图")
+    private String dtImgUrl;
+        @ApiModelProperty(value = "大厅数据统计模板(字典表)")
+    private String dtDataTemplate;
+        @ApiModelProperty(value = "席位欢迎语")
+    private String xwWelcomeWords;
+        @ApiModelProperty(value = "席位背景图")
+    private String xwImgUrl;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFair.java

@@ -0,0 +1,59 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_job_fair的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair的实体类")
+public class JobFair {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会名称")
+    private String name;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+        @ApiModelProperty(value = "入场时间段起")
+    private String admissionPeriodStart;
+    @ApiModelProperty(value = "入场时间段止")
+    private String admissionPeriodEnd;
+        @ApiModelProperty(value = "简介")
+    private String introduce;
+        @ApiModelProperty(value = "宣传图片")
+    private String imgUrls;
+        @ApiModelProperty(value = "视频地址")
+    private String videoUrl;
+    @ApiModelProperty(value = "招聘会状态")
+    private String status;
+    @ApiModelProperty(value = "招聘会状态")
+    private String statusN;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairAdmission.java

@@ -0,0 +1,49 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_job_fair_admission的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_admission的实体类")
+public class JobFairAdmission {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "用户ID(无则没有)")
+    private String jobUserId;
+        @ApiModelProperty(value = "姓名")
+    private String name;
+        @ApiModelProperty(value = "电话")
+    private String tel;
+        @ApiModelProperty(value = "身份证")
+    private String idCard;
+        @ApiModelProperty(value = "简历ID")
+    private String resumeId;
+        @ApiModelProperty(value = "人员状态")
+    private String type;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairCompany.java

@@ -0,0 +1,55 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_job_fair_company的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_company的实体类")
+public class JobFairCompany {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+    @ApiModelProperty(value = "招聘会名称")
+    private String jobFairName;
+        @ApiModelProperty(value = "企业ID")
+    private String companyId;
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+        @ApiModelProperty(value = "开放的职位ID")
+    private String recruitmentIds;
+    @ApiModelProperty(value = "开放的职位名称")
+    private String recruitmentNames;
+    @ApiModelProperty(value = "开放的职位数")
+    private Integer recruitmentNums;
+        @ApiModelProperty(value = "招聘人数")
+    private Integer num;
+        @ApiModelProperty(value = "联系人")
+    private String contactPerson;
+        @ApiModelProperty(value = "联系方式")
+    private String tel;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairDeliverRecord.java

@@ -0,0 +1,41 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_job_fair_deliver_record的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_deliver_record的实体类")
+public class JobFairDeliverRecord {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "简历ID")
+    private String resumeId;
+        @ApiModelProperty(value = "职位ID")
+    private String recruitmentId;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/SeatManage.java

@@ -0,0 +1,59 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_seat_manage的实体类
+ */
+@Data
+@ApiModel(value = "manage_seat_manage的实体类")
+public class SeatManage {
+        @ApiModelProperty(value = "")
+    private String id;
+        @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 createBy;
+        @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 updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "席位编号")
+    private String seatNum;
+        @ApiModelProperty(value = "显示模板")
+    private String template;
+        @ApiModelProperty(value = "企业ID")
+    private String companyId;
+    @ApiModelProperty(value = "企业ID")
+    private String companyName;
+        @ApiModelProperty(value = "介绍")
+    private String introduce;
+        @ApiModelProperty(value = "图片地址")
+    private String imgUrls;
+        @ApiModelProperty(value = "图片地址")
+    private String videoUrl;
+    @ApiModelProperty(value = "状态")
+    private String status;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/entity/SeatManageApprove.java

@@ -0,0 +1,53 @@
+package com.jpsoft.employment.modules.manage.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;
+
+/**
+  描述:manage_seat_manage_approve的实体类
+ */
+@Data
+@ApiModel(value = "manage_seat_manage_approve的实体类")
+public class SeatManageApprove {
+        @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 manageId;
+        @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;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/DeviceConfigurationService.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.DeviceConfiguration;
+
+public interface DeviceConfigurationService {
+	DeviceConfiguration get(String id);
+	boolean exist(String id);
+	int insert(DeviceConfiguration model);
+	int update(DeviceConfiguration model);
+	int delete(String id);
+	List<DeviceConfiguration> list();
+	Page<DeviceConfiguration> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairAdmissionService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.JobFairAdmission;
+
+public interface JobFairAdmissionService {
+	JobFairAdmission get(String id);
+	boolean exist(String id);
+	int insert(JobFairAdmission model);
+	int update(JobFairAdmission model);
+	int delete(String id);
+	List<JobFairAdmission> list();
+	Page<JobFairAdmission> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairCompanyService.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.JobFairCompany;
+
+public interface JobFairCompanyService {
+	JobFairCompany get(String id);
+	boolean exist(String id);
+	int insert(JobFairCompany model);
+	int update(JobFairCompany model);
+	int delete(String id);
+	List<JobFairCompany> list();
+	Page<JobFairCompany> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+
+	List<JobFairCompany> findByFairId(String fairId);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairDeliverRecordService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.JobFairDeliverRecord;
+
+public interface JobFairDeliverRecordService {
+	JobFairDeliverRecord get(String id);
+	boolean exist(String id);
+	int insert(JobFairDeliverRecord model);
+	int update(JobFairDeliverRecord model);
+	int delete(String id);
+	List<JobFairDeliverRecord> list();
+	Page<JobFairDeliverRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.JobFair;
+
+public interface JobFairService {
+	JobFair get(String id);
+	boolean exist(String id);
+	int insert(JobFair model);
+	int update(JobFair model);
+	int delete(String id);
+	List<JobFair> list();
+	Page<JobFair> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/SeatManageApproveService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.SeatManageApprove;
+
+public interface SeatManageApproveService {
+	SeatManageApprove get(String id);
+	boolean exist(String id);
+	int insert(SeatManageApprove model);
+	int update(SeatManageApprove model);
+	int delete(String id);
+	List<SeatManageApprove> list();
+	Page<SeatManageApprove> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/SeatManageService.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.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.manage.entity.SeatManage;
+
+public interface SeatManageService {
+	SeatManage get(String id);
+	boolean exist(String id);
+	int insert(SeatManage model);
+	int update(SeatManage model);
+	int delete(String id);
+	List<SeatManage> list();
+	Page<SeatManage> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+
+	SeatManage findByNum(String seatNum);
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/DeviceConfigurationServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.DeviceConfigurationDAO;
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+import com.jpsoft.employment.modules.manage.service.DeviceConfigurationService;
+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="deviceConfigurationService")
+public class DeviceConfigurationServiceImpl implements DeviceConfigurationService {
+	@Resource(name="deviceConfigurationDAO")
+	private DeviceConfigurationDAO deviceConfigurationDAO;
+
+	@Override
+	public DeviceConfiguration get(String id) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.get(id);
+	}
+
+	@Override
+	public int insert(DeviceConfiguration model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return deviceConfigurationDAO.insert(model);
+	}
+
+	@Override
+	public int update(DeviceConfiguration model) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = deviceConfigurationDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<DeviceConfiguration> list() {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.list();
+	}
+		
+	@Override
+	public Page<DeviceConfiguration> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<DeviceConfiguration> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            deviceConfigurationDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairAdmissionServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairAdmissionDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+import com.jpsoft.employment.modules.manage.service.JobFairAdmissionService;
+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="jobFairAdmissionService")
+public class JobFairAdmissionServiceImpl implements JobFairAdmissionService {
+	@Resource(name="jobFairAdmissionDAO")
+	private JobFairAdmissionDAO jobFairAdmissionDAO;
+
+	@Override
+	public JobFairAdmission get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairAdmission model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairAdmissionDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairAdmission model) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairAdmissionDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairAdmission> list() {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairAdmission> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairAdmission> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairAdmissionDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairCompanyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairCompanyDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+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="jobFairCompanyService")
+public class JobFairCompanyServiceImpl implements JobFairCompanyService {
+	@Resource(name="jobFairCompanyDAO")
+	private JobFairCompanyDAO jobFairCompanyDAO;
+
+	@Override
+	public JobFairCompany get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairCompany model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairCompanyDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairCompany model) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairCompanyDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairCompany> list() {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairCompany> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairCompany> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairCompanyDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+
+	@Override
+	public List<JobFairCompany> findByFairId(String fairId){
+		return jobFairCompanyDAO.findByFairId(fairId);
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairDeliverRecordServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairDeliverRecordDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+import com.jpsoft.employment.modules.manage.service.JobFairDeliverRecordService;
+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="jobFairDeliverRecordService")
+public class JobFairDeliverRecordServiceImpl implements JobFairDeliverRecordService {
+	@Resource(name="jobFairDeliverRecordDAO")
+	private JobFairDeliverRecordDAO jobFairDeliverRecordDAO;
+
+	@Override
+	public JobFairDeliverRecord get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairDeliverRecord model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairDeliverRecordDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairDeliverRecord model) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairDeliverRecordDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairDeliverRecord> list() {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairDeliverRecord> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairDeliverRecord> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairDeliverRecordDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+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="jobFairService")
+public class JobFairServiceImpl implements JobFairService {
+	@Resource(name="jobFairDAO")
+	private JobFairDAO jobFairDAO;
+
+	@Override
+	public JobFair get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFair model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFair model) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFair> list() {
+		// TODO Auto-generated method stub
+		return jobFairDAO.list();
+	}
+		
+	@Override
+	public Page<JobFair> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFair> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/SeatManageApproveServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.SeatManageApproveDAO;
+import com.jpsoft.employment.modules.manage.entity.SeatManageApprove;
+import com.jpsoft.employment.modules.manage.service.SeatManageApproveService;
+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="seatManageApproveService")
+public class SeatManageApproveServiceImpl implements SeatManageApproveService {
+	@Resource(name="seatManageApproveDAO")
+	private SeatManageApproveDAO seatManageApproveDAO;
+
+	@Override
+	public SeatManageApprove get(String id) {
+		// TODO Auto-generated method stub
+		return seatManageApproveDAO.get(id);
+	}
+
+	@Override
+	public int insert(SeatManageApprove model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return seatManageApproveDAO.insert(model);
+	}
+
+	@Override
+	public int update(SeatManageApprove model) {
+		// TODO Auto-generated method stub
+		return seatManageApproveDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return seatManageApproveDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = seatManageApproveDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<SeatManageApprove> list() {
+		// TODO Auto-generated method stub
+		return seatManageApproveDAO.list();
+	}
+		
+	@Override
+	public Page<SeatManageApprove> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<SeatManageApprove> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            seatManageApproveDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/SeatManageServiceImpl.java

@@ -0,0 +1,76 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.SeatManageDAO;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import com.jpsoft.employment.modules.manage.service.SeatManageService;
+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="seatManageService")
+public class SeatManageServiceImpl implements SeatManageService {
+	@Resource(name="seatManageDAO")
+	private SeatManageDAO seatManageDAO;
+
+	@Override
+	public SeatManage get(String id) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.get(id);
+	}
+
+	@Override
+	public int insert(SeatManage model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return seatManageDAO.insert(model);
+	}
+
+	@Override
+	public int update(SeatManage model) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = seatManageDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<SeatManage> list() {
+		// TODO Auto-generated method stub
+		return seatManageDAO.list();
+	}
+		
+	@Override
+	public Page<SeatManage> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<SeatManage> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            seatManageDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+
+	@Override
+	public SeatManage findByNum(String seatNum){
+		return seatManageDAO.findByNum(seatNum);
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/sys/dao/PermissionDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/sys/dao/RolePermissionDAO.java

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

common/src/main/java/com/jpsoft/employment/modules/sys/entity/Permission.java

@@ -0,0 +1,143 @@
+package com.jpsoft.employment.modules.sys.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ 描述:sys_permission的实体类
+ */
+public class Permission {
+	private String id;
+	private String path;
+	private String method;
+	private String summary;
+	private Boolean delFlag;
+	private String createBy;
+	private String updateBy;
+	private Date createTime;
+	private Date updateTime;
+
+	/**
+	 *获取主键
+	 */
+	public String getId(){
+		return id;
+	}
+
+	/**
+	 *设置主键
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+	/**
+	 *获取访问路径
+	 */
+	public String getPath(){
+		return path;
+	}
+
+	/**
+	 *设置访问路径
+	 */
+	public void setPath(String path){
+		this.path = path;
+	}
+	/**
+	 *获取访问方式
+	 */
+	public String getMethod(){
+		return method;
+	}
+
+	/**
+	 *设置访问方式
+	 */
+	public void setMethod(String method){
+		this.method = method;
+	}
+	/**
+	 *获取简介
+	 */
+	public String getSummary(){
+		return summary;
+	}
+
+	/**
+	 *设置简介
+	 */
+	public void setSummary(String summary){
+		this.summary = summary;
+	}
+	/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	/**
+	 *获取创建人
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+	/**
+	 *获取更新人
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	/**
+	 *获取创建时间
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	/**
+	 *获取更新时间
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/sys/entity/RolePermission.java

@@ -0,0 +1,129 @@
+package com.jpsoft.employment.modules.sys.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:sys_role_permission的实体类
+ */
+public class RolePermission {
+	private String id;
+	private String permId;
+	private String roleId;
+	private Boolean delFlag;
+	private String createBy;
+	private String updateBy;
+	private Date createTime;
+	private Date updateTime;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getPermId(){
+		return permId;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setPermId(String permId){
+		this.permId = permId;
+	}
+		/**
+	 *获取
+	 */
+	public String getRoleId(){
+		return roleId;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setRoleId(String roleId){
+		this.roleId = roleId;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取创建人
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		/**
+	 *获取更新人
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取创建时间
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取更新时间
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/sys/service/PermissionService.java

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

common/src/main/java/com/jpsoft/employment/modules/sys/service/RolePermissionService.java

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

common/src/main/java/com/jpsoft/employment/modules/sys/service/impl/PermissionServiceImpl.java

@@ -0,0 +1,75 @@
+package com.jpsoft.employment.modules.sys.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.sys.dao.PermissionDAO;
+import com.jpsoft.employment.modules.sys.entity.Permission;
+import com.jpsoft.employment.modules.sys.service.PermissionService;
+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="permissionService")
+public class PermissionServiceImpl implements PermissionService {
+	@Resource(name="permissionDAO")
+	private PermissionDAO permissionDAO;
+
+	@Override
+	public Permission get(String id) {
+		// TODO Auto-generated method stub
+		return permissionDAO.get(id);
+	}
+
+	@Override
+	public int insert(Permission model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return permissionDAO.insert(model);
+	}
+
+	@Override
+	public int update(Permission model) {
+		// TODO Auto-generated method stub
+		return permissionDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return permissionDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String path, String method) {
+		// TODO Auto-generated method stub
+		int count = permissionDAO.exist(path,method);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<Permission> list() {
+		// TODO Auto-generated method stub
+		return permissionDAO.list();
+	}
+		
+	@Override
+	public Page<Permission> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<Permission> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+            permissionDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+
+	@Override
+	public boolean hasPermitted(String userId, String path, String method) {
+		return permissionDAO.hasPermitted(userId,path,method)>0 ? true : false;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/sys/service/impl/RolePermissionServiceImpl.java

@@ -0,0 +1,80 @@
+package com.jpsoft.employment.modules.sys.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.sys.dao.RolePermissionDAO;
+import com.jpsoft.employment.modules.sys.entity.RolePermission;
+import com.jpsoft.employment.modules.sys.service.RolePermissionService;
+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="rolePermissionService")
+public class RolePermissionServiceImpl implements RolePermissionService {
+	@Resource(name="rolePermissionDAO")
+	private RolePermissionDAO rolePermissionDAO;
+
+	@Override
+	public RolePermission get(String id) {
+		// TODO Auto-generated method stub
+		return rolePermissionDAO.get(id);
+	}
+
+	@Override
+	public int insert(RolePermission model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return rolePermissionDAO.insert(model);
+	}
+
+	@Override
+	public int update(RolePermission model) {
+		// TODO Auto-generated method stub
+		return rolePermissionDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return rolePermissionDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = rolePermissionDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<RolePermission> list() {
+		// TODO Auto-generated method stub
+		return rolePermissionDAO.list();
+	}
+		
+	@Override
+	public Page<RolePermission> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
+        Page<RolePermission> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+            rolePermissionDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+
+	@Override
+	public List<RolePermission> findByRoleId(String roleId) {
+		return rolePermissionDAO.findByRoleId(roleId);
+	}
+
+	@Override
+	public int deleteByRoleId(String roleId) {
+		return rolePermissionDAO.deleteByRoleId(roleId);
+	}
+}

common/src/main/resources/mapper/base/Company.xml

@@ -157,7 +157,7 @@
 		select count(*) from base_company where id_=#{0}
 	</select>
 	<select id="list" resultMap="CompanyMap">
-		select * from base_company
+		select * from base_company where del_flag = 0
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="CompanyMap">
 		<![CDATA[
@@ -188,4 +188,10 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+
+	<select id="findByAll" resultMap="CompanyMap">
+		select * from base_company where del_flag = 0
+		and is_certification = 2
+		order by sort_no
+	</select>
 </mapper>

common/src/main/resources/mapper/base/MessageNotice.xml

@@ -207,14 +207,15 @@
 
 	<select id="findNotRead" resultType="int">
 		SELECT
-		b.is_read,
-		a.*
+		count(a.id_)
 		FROM
 		base_message_notice a
-		LEFT JOIN base_message_read b ON a.id_ = b.message_id
+		LEFT JOIN base_message_read b ON a.id_ = b.message_id  and b.user_id = #{userId}
 		WHERE
 		a.del_flag = 0
-		AND a.classify_ = '1'
+		<if test="classify != null">
+			AND a.classify_ = #{classify}
+		</if>
 		AND ( recipient_id = #{userId} OR recipient_id IS NULL )
 		AND a.status_ = '1'
 		AND a.type_ = '1'

common/src/main/resources/mapper/job/Recruitment.xml

@@ -358,4 +358,67 @@
 			and company_id = #{companyId}
 	</select>
 
+	<select id="listByCompanyId" resultMap="RecruitmentMap">
+		SELECT
+		*
+		FROM
+		job_recruitment
+		where del_flag = 0
+		and status_ = 1
+		and approve_status = 3
+		and company_id = #{companyId}
+	</select>
+
+	<select id="listByApproved" resultMap="RecruitmentMap">
+		SELECT
+		*
+		FROM
+		job_recruitment
+		where del_flag = 0
+		and status_ = 1
+		and approve_status = 3
+	</select>
+
+	<select id="findNumber" resultType="int">
+		SELECT
+		count( * )
+		FROM
+		job_recruitment
+		WHERE
+		del_flag = 0
+		AND status_ = 1
+		AND approve_status = 3
+		<if test="companyId != null">
+			and company_id = #{companyId}
+		</if>
+	</select>
+
+	<select id="findPositionNumber" resultType="int">
+		SELECT
+			SUM( position_number )
+		FROM
+			job_recruitment
+		WHERE
+			del_flag = 0
+			AND status_ = 1
+			AND approve_status = 3
+			<if test="companyId != null">
+				and company_id = #{companyId}
+			</if>
+	</select>
+
+	<select id="findSexNumber" resultType="int">
+		SELECT
+		count(*)
+		FROM
+		job_recruitment
+		WHERE
+		del_flag = 0
+		AND status_ = 1
+		AND approve_status = 3
+		and position_sex = #{sex}
+		<if test="companyId != null">
+			and company_id = #{companyId}
+		</if>
+	</select>
 </mapper>

common/src/main/resources/mapper/job/ResumeDeliverContent.xml

@@ -151,4 +151,18 @@
 			create_time DESC
 		LIMIT 1
 	</select>
+
+	<select id="findTopByDeliverId" resultMap="ResumeDeliverContentMap">
+		SELECT
+		*
+		FROM
+		job_resume_deliver_content
+		WHERE
+		deliver_id = #{userId}
+		and del_flag = 0
+		ORDER BY
+		create_time DESC
+		LIMIT 1
+	</select>
+
 </mapper>

common/src/main/resources/mapper/job/WorkCategory.xml

@@ -114,4 +114,17 @@
 	<select id="findListByParentId" parameterType="string" resultMap="WorkCategoryMap">
 		select * from job_work_category where del_flag=0 and parent_id=#{0} order by sort_no asc
 	</select>
+
+	<select id="findByCompany" resultMap="WorkCategoryMap">
+		SELECT DISTINCT
+		position_ as id_,
+		b.name_
+		FROM
+		job_recruitment a
+		LEFT JOIN job_work_category b ON a.position_ = b.id_
+		WHERE
+		a.del_flag = 0
+		and company_id = #{companyId}
+	</select>
+
 </mapper>

common/src/main/resources/mapper/manage/DeviceConfiguration.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.DeviceConfigurationDAO">
+	<resultMap id="DeviceConfigurationMap" type="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="dmWelcomeWords" column="dm_welcome_words" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="dtTemplate" column="dt_template" />
+			<result property="dtWelcomeWords" column="dt__welcome_words" />
+			<result property="dtImgUrl" column="dt_img_url" />
+			<result property="dtDataTemplate" column="dt_data_template" />
+			<result property="xwWelcomeWords" column="xw_welcome_words" />
+			<result property="xwImgUrl" column="xw_img_url" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_device_configuration
+	    (id_,create_time,create_by,update_time,update_by,del_flag,dm_welcome_words,job_fair_id,dt_template,dt__welcome_words,dt_img_url,dt_data_template,xw_welcome_words,xw_img_url)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{dmWelcomeWords,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{dtTemplate,jdbcType=VARCHAR}
+,#{dtWelcomeWords,jdbcType= NUMERIC }
+,#{dtImgUrl,jdbcType=VARCHAR}
+,#{dtDataTemplate,jdbcType=VARCHAR}
+,#{xwWelcomeWords,jdbcType= NUMERIC }
+,#{xwImgUrl,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_device_configuration where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+		update manage_device_configuration
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="dmWelcomeWords!=null">
+		dm_welcome_words=#{dmWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="dtTemplate!=null">
+		dt_template=#{dtTemplate,jdbcType=VARCHAR},
+		</if>
+				<if test="dtWelcomeWords!=null">
+		dt__welcome_words=#{dtWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="dtImgUrl!=null">
+		dt_img_url=#{dtImgUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="dtDataTemplate!=null">
+		dt_data_template=#{dtDataTemplate,jdbcType=VARCHAR},
+		</if>
+				<if test="xwWelcomeWords!=null">
+		xw_welcome_words=#{xwWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="xwImgUrl!=null">
+		xw_img_url=#{xwImgUrl,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="DeviceConfigurationMap">
+		select * from manage_device_configuration where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_device_configuration where id_=#{0}
+	</select>
+	<select id="list" resultMap="DeviceConfigurationMap">
+		select * from manage_device_configuration
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="DeviceConfigurationMap">
+		<![CDATA[
+			select * from manage_device_configuration
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/JobFair.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairDAO">
+	<resultMap id="JobFairMap" type="com.jpsoft.employment.modules.manage.entity.JobFair">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="name" column="name_" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			<result property="admissionPeriodStart" column="admission_period_start" />
+			<result property="admissionPeriodEnd" column="admission_period_end" />
+			<result property="introduce" column="introduce_" />
+			<result property="imgUrls" column="img_urls" />
+			<result property="videoUrl" column="video_url" />
+			<result property="status" column="status_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFair">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair
+	    (id_,create_time,create_by,update_time,update_by,del_flag,name_,start_time,end_time,admission_period_start,admission_period_end,introduce_,img_urls,video_url,status_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{name,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+,#{admissionPeriodStart,jdbcType=VARCHAR}
+,#{admissionPeriodEnd,jdbcType=VARCHAR}
+,#{introduce,jdbcType= NUMERIC }
+,#{imgUrls,jdbcType= NUMERIC }
+,#{videoUrl,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFair">
+		update manage_job_fair
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="admissionPeriodStart!=null">
+		admission_period_start=#{admissionPeriodStart,jdbcType=VARCHAR},
+		</if>
+			<if test="admissionPeriodEnd!=null">
+				admission_period_end=#{admissionPeriodEnd,jdbcType=VARCHAR},
+			</if>
+				<if test="introduce!=null">
+		introduce_=#{introduce,jdbcType= NUMERIC },
+		</if>
+				<if test="imgUrls!=null">
+		img_urls=#{imgUrls,jdbcType= NUMERIC },
+		</if>
+				<if test="videoUrl!=null">
+		video_url=#{videoUrl,jdbcType=VARCHAR},
+		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairMap">
+		select * from manage_job_fair where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairMap">
+		select * from manage_job_fair
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairMap">
+		<![CDATA[
+			select * from manage_job_fair
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.startTime != null">
+				<![CDATA[
+				and start_time >= #{searchParams.startTime}
+				]]>
+			</if>
+			<if test="searchParams.endTime != null">
+				<![CDATA[
+				and start_time <= #{searchParams.endTime}
+				]]>
+			</if>
+			<if test="searchParams.nowDate != null">
+				<![CDATA[
+				and start_time >= #{searchParams.nowDate}
+				]]>
+			</if>
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/JobFairAdmission.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairAdmissionDAO">
+	<resultMap id="JobFairAdmissionMap" type="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="jobUserId" column="job_user_id" />
+			<result property="name" column="name_" />
+			<result property="tel" column="tel_" />
+			<result property="idCard" column="id_card" />
+			<result property="resumeId" column="resume_id" />
+			<result property="type" column="type_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_admission
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,job_user_id,name_,tel_,id_card,resume_id,type_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{jobUserId,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{tel,jdbcType=VARCHAR}
+,#{idCard,jdbcType=VARCHAR}
+,#{resumeId,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_admission where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+		update manage_job_fair_admission
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="jobUserId!=null">
+		job_user_id=#{jobUserId,jdbcType=VARCHAR},
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="tel!=null">
+		tel_=#{tel,jdbcType=VARCHAR},
+		</if>
+				<if test="idCard!=null">
+		id_card=#{idCard,jdbcType=VARCHAR},
+		</if>
+				<if test="resumeId!=null">
+		resume_id=#{resumeId,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairAdmissionMap">
+		select * from manage_job_fair_admission where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_admission where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairAdmissionMap">
+		select * from manage_job_fair_admission
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairAdmissionMap">
+		<![CDATA[
+			select * from manage_job_fair_admission
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/JobFairCompany.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairCompanyDAO">
+	<resultMap id="JobFairCompanyMap" type="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="companyId" column="company_id" />
+			<result property="recruitmentIds" column="recruitment_ids" />
+			<result property="num" column="num_" />
+			<result property="contactPerson" column="contact_person" />
+			<result property="tel" column="tel_" />
+		<result property="jobFairName" column="job_fair_name" />
+		<result property="companyName" column="company_name" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_company
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,company_id,recruitment_ids,num_,contact_person,tel_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{recruitmentIds,jdbcType= NUMERIC }
+,#{num,jdbcType= NUMERIC }
+,#{contactPerson,jdbcType=VARCHAR}
+,#{tel,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_company where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+		update manage_job_fair_company
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="recruitmentIds!=null">
+		recruitment_ids=#{recruitmentIds,jdbcType= NUMERIC },
+		</if>
+				<if test="num!=null">
+		num_=#{num,jdbcType= NUMERIC },
+		</if>
+				<if test="contactPerson!=null">
+		contact_person=#{contactPerson,jdbcType=VARCHAR},
+		</if>
+				<if test="tel!=null">
+		tel_=#{tel,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairCompanyMap">
+		select * from manage_job_fair_company where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_company where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairCompanyMap">
+		select * from manage_job_fair_company
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairCompanyMap">
+		<![CDATA[
+			SELECT
+				a.*,
+				b.name_ AS company_name,
+				c.name_ AS job_fair_name
+			FROM
+				manage_job_fair_company a
+				LEFT JOIN base_company b ON a.company_id = b.id_
+				LEFT JOIN manage_job_fair c ON a.job_fair_id = c.id_
+		]]>
+		<where>
+			a.del_flag = 0
+			<if test="searchParams.id != null">
+				and a.ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.jobFairId != null">
+				and a.job_fair_id = #{searchParams.jobFairId}
+			</if>
+			<if test="searchParams.companyName != null">
+				and b.name_ like #{searchParams.companyName}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+	<select id="findByFairId" resultMap="JobFairCompanyMap">
+		SELECT
+			a.*,
+			b.name_ AS company_name,
+			c.name_ AS job_fair_name
+		FROM
+			manage_job_fair_company a
+			LEFT JOIN base_company b ON a.company_id = b.id_
+			LEFT JOIN manage_job_fair c ON a.job_fair_id = c.id_
+			where a.del_flag = 0
+			and a.job_fair_id =#{fairId}
+		order by create_time
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/JobFairDeliverRecord.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairDeliverRecordDAO">
+	<resultMap id="JobFairDeliverRecordMap" type="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="resumeId" column="resume_id" />
+			<result property="recruitmentId" column="recruitment_id" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_deliver_record
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,resume_id,recruitment_id)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{resumeId,jdbcType=VARCHAR}
+,#{recruitmentId,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_deliver_record where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+		update manage_job_fair_deliver_record
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="resumeId!=null">
+		resume_id=#{resumeId,jdbcType=VARCHAR},
+		</if>
+				<if test="recruitmentId!=null">
+		recruitment_id=#{recruitmentId,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairDeliverRecordMap">
+		select * from manage_job_fair_deliver_record where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_deliver_record where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairDeliverRecordMap">
+		select * from manage_job_fair_deliver_record
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairDeliverRecordMap">
+		<![CDATA[
+			select * from manage_job_fair_deliver_record
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/SeatManage.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.SeatManageDAO">
+	<resultMap id="SeatManageMap" type="com.jpsoft.employment.modules.manage.entity.SeatManage">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="seatNum" column="seat_num" />
+			<result property="template" column="template_" />
+			<result property="companyId" column="company_id" />
+			<result property="introduce" column="introduce_" />
+			<result property="imgUrls" column="img_urls" />
+			<result property="videoUrl" column="video_url" />
+			<result property="status" column="status_" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManage">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_seat_manage
+	    (id_,create_time,create_by,update_time,update_by,del_flag,seat_num,template_,company_id,introduce_,img_urls,video_url,
+	    status_,start_time,end_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{seatNum,jdbcType=VARCHAR}
+,#{template,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{introduce,jdbcType= NUMERIC }
+,#{imgUrls,jdbcType= NUMERIC }
+,#{videoUrl,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_seat_manage where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManage">
+		update manage_seat_manage
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="seatNum!=null">
+		seat_num=#{seatNum,jdbcType=VARCHAR},
+		</if>
+				<if test="template!=null">
+		template_=#{template,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="introduce!=null">
+		introduce_=#{introduce,jdbcType= NUMERIC },
+		</if>
+				<if test="imgUrls!=null">
+		img_urls=#{imgUrls,jdbcType= NUMERIC },
+		</if>
+				<if test="videoUrl!=null">
+		video_url=#{videoUrl,jdbcType=VARCHAR},
+		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
+			<if test="startTime!=null">
+				start_time=#{startTime,jdbcType= TIMESTAMP },
+			</if>
+			<if test="endTime!=null">
+				end_time=#{endTime,jdbcType= TIMESTAMP },
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="SeatManageMap">
+		select * from manage_seat_manage where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_seat_manage where id_=#{0}
+	</select>
+	<select id="list" resultMap="SeatManageMap">
+		select * from manage_seat_manage
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="SeatManageMap">
+		<![CDATA[
+			select * from manage_seat_manage
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.seatNum != null">
+				and seat_num like #{searchParams.seatNum}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+
+	<select id="findByNum" resultMap="SeatManageMap">
+		select * from manage_seat_manage
+		where
+			del_flag = 0
+			and seat_num = #{seatNum}
+
+	</select>
+</mapper>

common/src/main/resources/mapper/manage/SeatManageApprove.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.SeatManageApproveDAO">
+	<resultMap id="SeatManageApproveMap" type="com.jpsoft.employment.modules.manage.entity.SeatManageApprove">
+		<id property="id" column="id_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="manageId" column="manage_id" />
+			<result property="approvePersonId" column="approve_person_id" />
+			<result property="approveTime" column="approve_time" />
+			<result property="approvalStatus" column="approval_status" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManageApprove">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_seat_manage_approve
+	    (id_,create_by,create_time,update_by,update_time,del_flag,manage_id,approve_person_id,approve_time,approval_status,start_time,end_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{manageId,jdbcType=VARCHAR}
+,#{approvePersonId,jdbcType=VARCHAR}
+,#{approveTime,jdbcType= TIMESTAMP }
+,#{approvalStatus,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_seat_manage_approve where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManageApprove">
+		update manage_seat_manage_approve
+		<set>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="manageId!=null">
+		manage_id=#{manageId,jdbcType=VARCHAR},
+		</if>
+				<if test="approvePersonId!=null">
+		approve_person_id=#{approvePersonId,jdbcType=VARCHAR},
+		</if>
+				<if test="approveTime!=null">
+		approve_time=#{approveTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="approvalStatus!=null">
+		approval_status=#{approvalStatus,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="SeatManageApproveMap">
+		select * from manage_seat_manage_approve where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_seat_manage_approve where id_=#{0}
+	</select>
+	<select id="list" resultMap="SeatManageApproveMap">
+		select * from manage_seat_manage_approve
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="SeatManageApproveMap">
+		<![CDATA[
+			select * from manage_seat_manage_approve
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/sys/Permission.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.sys.dao.PermissionDAO">
+    <resultMap id="PermissionMap" type="com.jpsoft.employment.modules.sys.entity.Permission">
+        <id property="id" column="id_"/>
+        <result property="path" column="path_"/>
+        <result property="method" column="method_"/>
+        <result property="summary" column="summary_"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <insert id="insert" parameterType="com.jpsoft.employment.modules.sys.entity.Permission">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
+		insert into sys_permission
+	    (id_,path_,method_,summary_,del_flag,create_by,update_by,create_time,update_time)
+		values
+		(
+            #{id,jdbcType=VARCHAR}
+            ,#{path,jdbcType=VARCHAR}
+            ,#{method,jdbcType=VARCHAR}
+            ,#{summary,jdbcType=VARCHAR}
+            ,#{delFlag,jdbcType= NUMERIC }
+            ,#{createBy,jdbcType=VARCHAR}
+            ,#{updateBy,jdbcType=VARCHAR}
+            ,#{createTime,jdbcType= TIMESTAMP }
+            ,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+    </insert>
+    <delete id="delete" parameterType="string">
+        delete from sys_permission where id_=#{id,jdbcType=VARCHAR}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.employment.modules.sys.entity.Permission">
+        update sys_permission
+        <set>
+            <if test="path!=null">
+                path_=#{path,jdbcType=VARCHAR},
+            </if>
+            <if test="method!=null">
+                method_=#{method,jdbcType=VARCHAR},
+            </if>
+            <if test="summary!=null">
+                summary_=#{summary,jdbcType=VARCHAR},
+            </if>
+            <if test="delFlag!=null">
+                del_flag=#{delFlag,jdbcType= NUMERIC },
+            </if>
+            <if test="createBy!=null">
+                create_by=#{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateBy!=null">
+                update_by=#{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime!=null">
+                create_time=#{createTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime,jdbcType= TIMESTAMP },
+            </if>
+        </set>
+        where id_=#{id}
+    </update>
+    <select id="get" parameterType="string" resultMap="PermissionMap">
+        select
+        id_,path_,method_,summary_,del_flag,create_by,update_by,create_time,update_time from sys_permission where
+        id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from sys_permission where path_=#{path} and method_=#{method} and del_flag=0
+    </select>
+    <select id="list" resultMap="PermissionMap">
+        select * from sys_permission where del_flag=0
+    </select>
+    <select id="search" parameterType="hashmap" resultMap="PermissionMap">
+        <![CDATA[
+			select * from sys_permission
+		]]>
+        where del_flag=0
+        <if test="searchParams.path != null">
+            and path_ like #{searchParams.path}
+        </if>
+        <foreach item="sort" collection="sortList" open="order by" separator=",">
+            ${sort.name} ${sort.order}
+        </foreach>
+    </select>
+    <select id="hasPermitted" parameterType="string" resultType="int">
+        select count(*) from
+        sys_user u,sys_user_role ur,sys_role_permission rp,sys_permission p
+        where u.id_=#{userId}
+        and u.id_=ur.user_id
+        and ur.role_id = rp.role_id
+        and rp.perm_id = p.id_
+        and p.path_ = #{path}
+        <if test="method != null">
+            and p.method_ = #{method}
+        </if>
+    </select>
+</mapper>

common/src/main/resources/mapper/sys/RolePermission.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.sys.dao.RolePermissionDAO">
+	<resultMap id="RolePermissionMap" type="com.jpsoft.employment.modules.sys.entity.RolePermission">
+		<id property="id" column="id_" />
+			<result property="permId" column="perm_id" />
+			<result property="roleId" column="role_id" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.sys.entity.RolePermission">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into sys_role_permission
+	    (id_,perm_id,role_id,del_flag,create_by,update_by,create_time,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{permId,jdbcType=VARCHAR}
+,#{roleId,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from sys_role_permission where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<delete id="deleteByRoleId" parameterType="string">
+		delete from sys_role_permission where role_id=#{0}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.sys.entity.RolePermission">
+		update sys_role_permission
+		<set>
+				<if test="permId!=null">
+		perm_id=#{permId,jdbcType=VARCHAR},
+		</if>
+				<if test="roleId!=null">
+		role_id=#{roleId,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="RolePermissionMap">
+		select * from sys_role_permission where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from sys_role_permission where id_=#{0}
+	</select>
+	<select id="list" resultMap="RolePermissionMap">
+		select * from sys_role_permission
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="RolePermissionMap">
+		<![CDATA[
+			select * from sys_role_permission
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+	<select id="findByRoleId" parameterType="string" resultMap="RolePermissionMap">
+		select * from sys_role_permission where role_id=#{0}
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java

@@ -64,6 +64,12 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/sysUserApi/wechatLogin")
 				.excludePathPatterns("/mobile/sysUserApi/findByOpenId")
 				.excludePathPatterns("/mobile/sysUserApi/passwordLogin")
+				.excludePathPatterns("/mobile/dataScreenApi/jobFairScreenData")
+				.excludePathPatterns("/mobile/dataScreenApi/employmentOnlineData")
+				.excludePathPatterns("/mobile/dataScreenApi/companyData")
+				.excludePathPatterns("/mobile/dataScreenApi/recruitmentData")
+				.excludePathPatterns("/mobile/dataScreenApi/seatData")
+				.excludePathPatterns("/mobile/dataScreenApi/resumeDeliverData")
 		;
 
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/UserAuthenticationApproveController.java

@@ -42,7 +42,7 @@ public class UserAuthenticationApproveController {
     @Autowired
     private UserService userService;
     @Autowired
-    private MessageNoticeService messageNoticeService;
+    private     MessageNoticeService messageNoticeService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -892,4 +892,25 @@ public class RecruitmentController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<Recruitment>> list(
+            String companyId,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<Recruitment>> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Recruitment> list = recruitmentService.listByCompanyId(companyId);
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/manage/controller/DeviceConfigurationController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+import com.jpsoft.employment.modules.manage.service.DeviceConfigurationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/deviceConfiguration")
+@Api(description = "deviceConfiguration")
+public class DeviceConfigurationController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private DeviceConfigurationService deviceConfigurationService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<DeviceConfiguration> create(){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        DeviceConfiguration deviceConfiguration = new DeviceConfiguration();
+
+        msgResult.setData(deviceConfiguration);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<DeviceConfiguration> add(@RequestBody DeviceConfiguration deviceConfiguration,@RequestAttribute String subject){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            deviceConfiguration.setId(UUID.randomUUID().toString());
+            deviceConfiguration.setDelFlag(false);
+            deviceConfiguration.setCreateBy(subject);
+            deviceConfiguration.setCreateTime(new Date());
+            
+            int affectCount = deviceConfigurationService.insert(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<DeviceConfiguration> edit(@PathVariable("id") String id){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+
+            if (deviceConfiguration != null) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<DeviceConfiguration> update(@RequestBody DeviceConfiguration deviceConfiguration,@RequestAttribute String subject){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            deviceConfiguration.setUpdateBy(subject);
+            deviceConfiguration.setUpdateTime(new Date());
+            
+            int affectCount = deviceConfigurationService.update(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+            deviceConfiguration.setDelFlag(true);
+            deviceConfiguration.setUpdateBy(subject);
+            deviceConfiguration.setUpdateTime(new Date());
+
+            int affectCount = deviceConfigurationService.update(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+                deviceConfiguration.setDelFlag(true);
+                deviceConfiguration.setUpdateBy(subject);
+                deviceConfiguration.setUpdateTime(new Date());
+
+                affectCount += deviceConfigurationService.update(deviceConfiguration);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<DeviceConfiguration> page = deviceConfigurationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairAdmissionController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+import com.jpsoft.employment.modules.manage.service.JobFairAdmissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairAdmission")
+@Api(description = "jobFairAdmission")
+public class JobFairAdmissionController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairAdmissionService jobFairAdmissionService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairAdmission> create(){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        JobFairAdmission jobFairAdmission = new JobFairAdmission();
+
+        msgResult.setData(jobFairAdmission);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairAdmission> add(@RequestBody JobFairAdmission jobFairAdmission,@RequestAttribute String subject){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            jobFairAdmission.setId(UUID.randomUUID().toString());
+            jobFairAdmission.setDelFlag(false);
+            jobFairAdmission.setCreateBy(subject);
+            jobFairAdmission.setCreateTime(new Date());
+            
+            int affectCount = jobFairAdmissionService.insert(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairAdmission> edit(@PathVariable("id") String id){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+
+            if (jobFairAdmission != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairAdmission> update(@RequestBody JobFairAdmission jobFairAdmission,@RequestAttribute String subject){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            jobFairAdmission.setUpdateBy(subject);
+            jobFairAdmission.setUpdateTime(new Date());
+            
+            int affectCount = jobFairAdmissionService.update(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+            jobFairAdmission.setDelFlag(true);
+            jobFairAdmission.setUpdateBy(subject);
+            jobFairAdmission.setUpdateTime(new Date());
+
+            int affectCount = jobFairAdmissionService.update(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+                jobFairAdmission.setDelFlag(true);
+                jobFairAdmission.setUpdateBy(subject);
+                jobFairAdmission.setUpdateTime(new Date());
+
+                affectCount += jobFairAdmissionService.update(jobFairAdmission);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFairAdmission> page = jobFairAdmissionService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairCompanyController.java

@@ -0,0 +1,243 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.job.entity.Recruitment;
+import com.jpsoft.employment.modules.job.service.RecruitmentService;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairCompany")
+@Api(description = "jobFairCompany")
+public class JobFairCompanyController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairCompanyService jobFairCompanyService;
+    @Autowired
+    private RecruitmentService recruitmentService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairCompany> create(){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        JobFairCompany jobFairCompany = new JobFairCompany();
+
+        msgResult.setData(jobFairCompany);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairCompany> add(@RequestBody JobFairCompany jobFairCompany,@RequestAttribute String subject){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            jobFairCompany.setId(UUID.randomUUID().toString());
+            jobFairCompany.setDelFlag(false);
+            jobFairCompany.setCreateBy(subject);
+            jobFairCompany.setCreateTime(new Date());
+            
+            int affectCount = jobFairCompanyService.insert(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairCompany> edit(@PathVariable("id") String id){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+
+            if (jobFairCompany != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairCompany> update(@RequestBody JobFairCompany jobFairCompany,@RequestAttribute String subject){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            jobFairCompany.setUpdateBy(subject);
+            jobFairCompany.setUpdateTime(new Date());
+            
+            int affectCount = jobFairCompanyService.update(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+            jobFairCompany.setDelFlag(true);
+            jobFairCompany.setUpdateBy(subject);
+            jobFairCompany.setUpdateTime(new Date());
+
+            int affectCount = jobFairCompanyService.update(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+                jobFairCompany.setDelFlag(true);
+                jobFairCompany.setUpdateBy(subject);
+                jobFairCompany.setUpdateTime(new Date());
+
+                affectCount += jobFairCompanyService.update(jobFairCompany);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            String jobFairId,
+            String companyName,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("a.create_time","asc"));
+
+        searchParams.put("jobFairId",jobFairId);
+
+        if(StringUtils.isNotEmpty(companyName)) {
+            searchParams.put("companyName", "%" + companyName + "%");
+        }
+
+        Page<JobFairCompany> page = jobFairCompanyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(JobFairCompany jobFairCompany : page.getResult()){
+            String[] recruitmentIds = jobFairCompany.getRecruitmentIds().split(",");
+            List<String> rNameList = new ArrayList<>();
+            for(String recruitmentId : recruitmentIds){
+                Recruitment recruitment = recruitmentService.get(recruitmentId);
+                rNameList.add(recruitment.getTitle());
+            }
+            jobFairCompany.setRecruitmentNames(StringUtils.join(rNameList,","));
+        }
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairController.java

@@ -0,0 +1,272 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFair")
+@Api(description = "jobFair")
+public class JobFairController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairService jobFairService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFair> create(){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        JobFair jobFair = new JobFair();
+
+        msgResult.setData(jobFair);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFair> add(@RequestBody JobFair jobFair,@RequestAttribute String subject){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            jobFair.setId(UUID.randomUUID().toString());
+            jobFair.setDelFlag(false);
+            jobFair.setCreateBy(subject);
+            jobFair.setCreateTime(new Date());
+            
+            int affectCount = jobFairService.insert(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFair> edit(@PathVariable("id") String id){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            JobFair jobFair = jobFairService.get(id);
+
+            if (jobFair != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFair> update(@RequestBody JobFair jobFair,@RequestAttribute String subject){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            jobFair.setUpdateBy(subject);
+            jobFair.setUpdateTime(new Date());
+            
+            int affectCount = jobFairService.update(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFair jobFair = jobFairService.get(id);
+            jobFair.setDelFlag(true);
+            jobFair.setUpdateBy(subject);
+            jobFair.setUpdateTime(new Date());
+
+            int affectCount = jobFairService.update(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFair jobFair = jobFairService.get(id);
+                jobFair.setDelFlag(true);
+                jobFair.setUpdateBy(subject);
+                jobFair.setUpdateTime(new Date());
+
+                affectCount += jobFairService.update(jobFair);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String name,
+            String status,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("start_time","asc"));
+
+        if (startTime!=null){
+            searchParams.put("startTime",startTime);
+        }
+
+        if (endTime!=null){
+            searchParams.put("endTime",endTime);
+        }
+
+        if(StringUtils.isNotEmpty(name)) {
+            searchParams.put("name", "%" + name + "%");
+        }
+
+        if(StringUtils.isNotEmpty(status)) {
+            searchParams.put("status", status);
+        }
+
+        Page<JobFair> page = jobFairService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(JobFair jobFair : page.getResult()){
+           jobFair.setStatusN(dataDictionaryService.findNameByCatalogNameAndValue("招聘会状态",jobFair.getStatus()));
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public MessageResult<List> list() {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("start_time","asc"));
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        searchParams.put("nowDate",sdf.format(new Date()));
+
+        Page<JobFair> page = jobFairService.pageSearch(searchParams,1,1000,false, sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairDeliverRecordController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+import com.jpsoft.employment.modules.manage.service.JobFairDeliverRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairDeliverRecord")
+@Api(description = "jobFairDeliverRecord")
+public class JobFairDeliverRecordController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairDeliverRecordService jobFairDeliverRecordService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairDeliverRecord> create(){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        JobFairDeliverRecord jobFairDeliverRecord = new JobFairDeliverRecord();
+
+        msgResult.setData(jobFairDeliverRecord);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairDeliverRecord> add(@RequestBody JobFairDeliverRecord jobFairDeliverRecord,@RequestAttribute String subject){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            jobFairDeliverRecord.setId(UUID.randomUUID().toString());
+            jobFairDeliverRecord.setDelFlag(false);
+            jobFairDeliverRecord.setCreateBy(subject);
+            jobFairDeliverRecord.setCreateTime(new Date());
+            
+            int affectCount = jobFairDeliverRecordService.insert(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairDeliverRecord> edit(@PathVariable("id") String id){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+
+            if (jobFairDeliverRecord != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairDeliverRecord> update(@RequestBody JobFairDeliverRecord jobFairDeliverRecord,@RequestAttribute String subject){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            jobFairDeliverRecord.setUpdateBy(subject);
+            jobFairDeliverRecord.setUpdateTime(new Date());
+            
+            int affectCount = jobFairDeliverRecordService.update(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+            jobFairDeliverRecord.setDelFlag(true);
+            jobFairDeliverRecord.setUpdateBy(subject);
+            jobFairDeliverRecord.setUpdateTime(new Date());
+
+            int affectCount = jobFairDeliverRecordService.update(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+                jobFairDeliverRecord.setDelFlag(true);
+                jobFairDeliverRecord.setUpdateBy(subject);
+                jobFairDeliverRecord.setUpdateTime(new Date());
+
+                affectCount += jobFairDeliverRecordService.update(jobFairDeliverRecord);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFairDeliverRecord> page = jobFairDeliverRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/SeatManageApproveController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.SeatManageApprove;
+import com.jpsoft.employment.modules.manage.service.SeatManageApproveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/seatManageApprove")
+@Api(description = "seatManageApprove")
+public class SeatManageApproveController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private SeatManageApproveService seatManageApproveService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<SeatManageApprove> create(){
+        MessageResult<SeatManageApprove> msgResult = new MessageResult<>();
+
+        SeatManageApprove seatManageApprove = new SeatManageApprove();
+
+        msgResult.setData(seatManageApprove);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<SeatManageApprove> add(@RequestBody SeatManageApprove seatManageApprove,@RequestAttribute String subject){
+        MessageResult<SeatManageApprove> msgResult = new MessageResult<>();
+
+        try {
+            seatManageApprove.setId(UUID.randomUUID().toString());
+            seatManageApprove.setDelFlag(false);
+            seatManageApprove.setCreateBy(subject);
+            seatManageApprove.setCreateTime(new Date());
+            
+            int affectCount = seatManageApproveService.insert(seatManageApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManageApprove);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<SeatManageApprove> edit(@PathVariable("id") String id){
+        MessageResult<SeatManageApprove> msgResult = new MessageResult<>();
+
+        try {
+            SeatManageApprove seatManageApprove = seatManageApproveService.get(id);
+
+            if (seatManageApprove != null) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManageApprove);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<SeatManageApprove> update(@RequestBody SeatManageApprove seatManageApprove,@RequestAttribute String subject){
+        MessageResult<SeatManageApprove> msgResult = new MessageResult<>();
+
+        try {
+            seatManageApprove.setUpdateBy(subject);
+            seatManageApprove.setUpdateTime(new Date());
+            
+            int affectCount = seatManageApproveService.update(seatManageApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManageApprove);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            SeatManageApprove seatManageApprove = seatManageApproveService.get(id);
+            seatManageApprove.setDelFlag(true);
+            seatManageApprove.setUpdateBy(subject);
+            seatManageApprove.setUpdateTime(new Date());
+
+            int affectCount = seatManageApproveService.update(seatManageApprove);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                SeatManageApprove seatManageApprove = seatManageApproveService.get(id);
+                seatManageApprove.setDelFlag(true);
+                seatManageApprove.setUpdateBy(subject);
+                seatManageApprove.setUpdateTime(new Date());
+
+                affectCount += seatManageApproveService.update(seatManageApprove);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<SeatManageApprove> page = seatManageApproveService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/manage/controller/SeatManageController.java

@@ -0,0 +1,238 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.service.CompanyService;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import com.jpsoft.employment.modules.manage.service.SeatManageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/seatManage")
+@Api(description = "seatManage")
+public class SeatManageController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private SeatManageService seatManageService;
+
+    @Autowired
+    private CompanyService companyService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<SeatManage> create(){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        SeatManage seatManage = new SeatManage();
+
+        msgResult.setData(seatManage);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<SeatManage> add(@RequestBody SeatManage seatManage,@RequestAttribute String subject){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            seatManage.setId(UUID.randomUUID().toString());
+            seatManage.setDelFlag(false);
+            seatManage.setCreateBy(subject);
+            seatManage.setCreateTime(new Date());
+            
+            int affectCount = seatManageService.insert(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<SeatManage> edit(@PathVariable("id") String id){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            SeatManage seatManage = seatManageService.get(id);
+
+            if (seatManage != null) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<SeatManage> update(@RequestBody SeatManage seatManage,@RequestAttribute String subject){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            seatManage.setUpdateBy(subject);
+            seatManage.setUpdateTime(new Date());
+            
+            int affectCount = seatManageService.update(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            SeatManage seatManage = seatManageService.get(id);
+            seatManage.setDelFlag(true);
+            seatManage.setUpdateBy(subject);
+            seatManage.setUpdateTime(new Date());
+
+            int affectCount = seatManageService.update(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                SeatManage seatManage = seatManageService.get(id);
+                seatManage.setDelFlag(true);
+                seatManage.setUpdateBy(subject);
+                seatManage.setUpdateTime(new Date());
+
+                affectCount += seatManageService.update(seatManage);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String seatNum,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("seat_num","asc"));
+
+        if (StringUtils.isNotEmpty(seatNum)) {
+            searchParams.put("seatNum","%" + seatNum + "%");
+        }
+
+        Page<SeatManage> page = seatManageService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(SeatManage seatManage:page){
+            if(StringUtils.isNotEmpty(seatManage.getCompanyId())) {
+                Company company = companyService.get(seatManage.getCompanyId());
+                if(company != null){
+                    seatManage.setCompanyName(company.getName());
+                }
+            }
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/DataScreenApiController.java

@@ -0,0 +1,391 @@
+package com.jpsoft.employment.modules.mobile.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.base.service.CompanyService;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.dto.MessageResultBuilder;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.utils.MapUtils;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.utils.StringUtils;
+import com.jpsoft.employment.modules.job.entity.*;
+import com.jpsoft.employment.modules.job.service.*;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+import com.jpsoft.employment.modules.manage.service.SeatManageService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mobile/dataScreenApi")
+@Api(tags = "大屏接口")
+@Slf4j
+public class DataScreenApiController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+    @Autowired
+    private JobFairService jobFairService;
+
+    @Autowired
+    private JobFairCompanyService jobFairCompanyService;
+
+    @Autowired
+    private CompanyService companyService;
+
+    @Autowired
+    private RecruitmentService recruitmentService;
+
+    @Autowired
+    private SeatManageService seatManageService;
+
+    @Autowired
+    private WorkCategoryService workCategoryService;
+
+    @Autowired
+    private ResumeDeliverService resumeDeliverService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private ResumeService resumeService;
+
+    @Autowired
+    private JobUserService jobUserService;
+
+    @PostMapping("jobFairScreenData")
+    @ApiOperation(value = "招聘会大屏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "jobFairId", value = "招聘会ID", required = true, paramType = "form")
+    })
+    public MessageResult<Map> jobFairScreenData( String jobFairId){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+            if(StringUtils.isEmpty(jobFairId)){
+                throw new Exception("招聘会查询错误");
+            }
+
+            JobFair jobFair = jobFairService.get(jobFairId);
+            if(jobFair == null){
+                throw new Exception("未找到该招聘会");
+            }
+
+            List<JobFairCompany> jobFairCompanyList = jobFairCompanyService.findByFairId(jobFairId);
+
+            int recruitmentNum = 0;
+            int recruitsNum = 0;//招聘人数
+            int totalNum = 0;//总入场人数
+            int todayNum = 0;//今日入场数
+            int resumeNum = 0;//简历投递数
+
+            int manNum = 0;
+            int womanNum = 0;
+            //简历投递数
+            for(JobFairCompany jobFairCompany : jobFairCompanyList){
+                String[] recruitmentIds = jobFairCompany.getRecruitmentIds().split(",");
+                jobFairCompany.setRecruitmentNums(recruitmentIds.length);
+                recruitmentNum = recruitmentNum + recruitmentIds.length;
+                recruitsNum = recruitsNum + recruitmentService.findPositionNumber(jobFairCompany.getCompanyId());
+                manNum = manNum + recruitmentService.findSexNumber("1",jobFairCompany.getCompanyId());
+                womanNum = womanNum + recruitmentService.findSexNumber("0",jobFairCompany.getCompanyId());
+            }
+
+
+
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            dataMap.put("jobFair", jobFair);//招聘会信息
+            dataMap.put("jobFairCompanyList", jobFairCompanyList);//招聘企业信息
+            dataMap.put("jobFairCompanyNum", jobFairCompanyList.size());//入场企业数
+            dataMap.put("recruitmentNum", recruitmentNum);//招聘岗位数
+            dataMap.put("recruitsNum", recruitsNum);//招聘人数
+            dataMap.put("totalNum", totalNum);//总入场人数
+            dataMap.put("todayNum", todayNum);//今日入场数
+            dataMap.put("resumeNum", resumeNum);//简历投递数
+
+            jobFairService.get(jobFairId);
+
+            messageResult.setData(dataMap);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("employmentOnlineData")
+    @ApiOperation(value = "就业在线数据大屏")
+    public MessageResult<Map> employmentOnlineData(){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+            int manNum = 0;
+            int womanNum = 0;
+            int recruitsNum = 0;
+            int shortageCompanyNum = 0;
+            int shortageRecruitNum = 0;
+
+
+
+            List<Recruitment> recruitmentList = recruitmentService.listByApproved();
+
+            recruitsNum = recruitmentService.findPositionNumber(null);
+
+            manNum = recruitmentService.findSexNumber("1",null);
+
+            womanNum = recruitmentService.findSexNumber("0",null);
+
+            //List<Company> companyList = companyService.list();
+            List<Company> companyList = companyService.findByAll();
+            //List<Company> companyList = new ArrayList<>();
+            for(Company company : companyList){
+                int postNum = recruitmentService.findNumber(company.getId());
+                int peopleNum = recruitmentService.findPositionNumber(company.getId());
+
+                company.setPostNum(postNum);
+                company.setPeopleNum(peopleNum);
+                //companyList.add(company);
+            }
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            //入住企业
+            dataMap.put("companyList", companyList);
+            //入住企业数
+            dataMap.put("companyNum", companyList.size());
+            //招聘岗位数
+            dataMap.put("postNum", recruitmentList.size());
+            //招聘人数
+            dataMap.put("postPeopleNum", recruitsNum);
+            //男人数
+            dataMap.put("manNum", manNum);
+            //女人数
+            dataMap.put("womanNUm", womanNum);
+
+            //紧缺企业数
+            dataMap.put("shortageCompanyNum", shortageCompanyNum);
+            //紧缺岗位数
+            dataMap.put("shortageRecruitNum", shortageRecruitNum);
+
+            messageResult.setData(dataMap);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("companyData")
+    @ApiOperation(value = "查询入住企业")
+    public MessageResult<Map> companyData(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+                                          @RequestParam(value="pageSize",defaultValue="10") int pageSize){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("sort_no","asc"));
+            sortList.add(new Sort("create_time","asc"));
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+            Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            for(Company company : page.getResult()){
+                int postNum = recruitmentService.findNumber(company.getId());
+                int peopleNum = recruitmentService.findPositionNumber(null);
+
+                company.setPostNum(postNum);
+                company.setPeopleNum(peopleNum);
+
+            }
+
+            messageResult.setData(PojoUtils.pageWrapper(page));
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("recruitmentData")
+    @ApiOperation(value = "查询招聘职位")
+    public MessageResult<Map> recruitmentData(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+                                          @RequestParam(value="pageSize",defaultValue="10") int pageSize){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+            searchParams.put("status","1");
+            searchParams.put("approveStatus","3");
+
+            Page<Recruitment> page = recruitmentService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            for(Recruitment recruitment : page.getResult()){
+                WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+                if(workCategory != null) {
+                    recruitment.setPositionName(workCategory.getName());
+                }
+                recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
+                recruitment.setPositionSexN(dataDictionaryService.findNameByCatalogNameAndValue("性别",recruitment.getPositionSex()));
+                recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
+                recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
+
+                //recruitmentList.add(recruitment);
+            }
+
+
+            messageResult.setData(PojoUtils.pageWrapper(page));
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("seatData")
+    @ApiOperation(value = "席位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "seatNumber", value = "席位编号", required = true, paramType = "form")
+    })
+    public MessageResult<Map> seatData( String seatNumber){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+            if(StringUtils.isEmpty(seatNumber)){
+                throw new Exception("查询错误");
+            }
+
+            SeatManage seatManage = seatManageService.findByNum(seatNumber);
+
+            if(seatManage == null || StringUtils.isEmpty(seatManage.getCompanyId())){
+                throw new Exception("该席位目前未绑定企业");
+            }
+
+            Company company = companyService.get(seatManage.getCompanyId());
+            if(company == null){
+                throw new Exception("企业有误");
+            }
+
+            //List<WorkCategory> workCategoryList = workCategoryService.findByCompany(company.getId());
+            List<Recruitment> recruitmentList = recruitmentService.findByCompanyId(company.getId());
+            //List<Recruitment> recruitmentList = new ArrayList<>();
+            for(Recruitment recruitment : recruitmentList){
+                WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+                if(workCategory != null) {
+                    recruitment.setPositionName(workCategory.getName());
+                }
+                recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
+                recruitment.setPositionSexN(dataDictionaryService.findNameByCatalogNameAndValue("性别",recruitment.getPositionSex()));
+                recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
+                //recruitmentList.add(recruitment);
+            }
+
+            String scale = dataDictionaryService.getName(company.getScale());
+            String industry = dataDictionaryService.getName(company.getIndustry());
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            dataMap.put("company", company);
+            dataMap.put("companyId", company.getId());
+            dataMap.put("scale", scale);//规模
+            dataMap.put("industry", industry);//行业
+            dataMap.put("introduction", company.getIntroduction());//介绍
+            dataMap.put("videoUrl", "http://xpgj.oss-cn-shanghai.aliyuncs.com/xpgj/test/VID_20220105_144821.mp4");//视频
+            dataMap.put("recruitmentList", recruitmentList);
+
+            messageResult.setData(dataMap);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("resumeDeliverData")
+    @ApiOperation(value = "简历投递记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "企业编号", required = true, paramType = "form")
+    })
+    public MessageResult<Map> resumeDeliverData( String companyId,
+                         @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+                         @RequestParam(value="pageSize",defaultValue="10") int pageSize){
+        MessageResult<Map> messageResult = new MessageResult<>();
+        try{
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
+
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("companyId",companyId);
+
+            Page<ResumeDeliver> page = resumeDeliverService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            String userSex = "先生";
+            for(ResumeDeliver rd : page.getResult()){
+                Recruitment recruitment = recruitmentService.get(rd.getJobRecruitmentId());
+                WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+                if(workCategory != null) {
+                    recruitment.setPositionName(workCategory.getName());
+                }
+                rd.setJobRecruitment(recruitment);
+                JobUser jobUser = jobUserService.get(rd.getJobUserId());
+                Resume resume = resumeService.get(rd.getJobResumeId());
+
+                rd.setJobUserSex(resume.getSex());
+                rd.setJobUserName(jobUser.getRealName());
+            }
+
+            messageResult.setData(PojoUtils.pageWrapper(page));
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        }
+        catch(Exception ex){
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+}

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageNoticeApiController.java

@@ -139,11 +139,11 @@ public class MessageNoticeApiController {
                     Map<String, Object> mnMap = new HashMap<>();
                     //job_resume_deliver_content
                     ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(jobUser.getId());
-
+                    int newNum = messageNoticeService.findNotRead(jobUser.getId(),"2");
                     mnMap.put("classify","求职消息");
                     mnMap.put("classifyId","2");
                     mnMap.put("newMessage",rdc);
-                    mnMap.put("num",0);
+                    mnMap.put("num",newNum);
 
                     resultList.add(mnMap);
                 }else if("3".equals(classify)){
@@ -152,8 +152,8 @@ public class MessageNoticeApiController {
                     int newNum = messageNoticeService.findNotRead(jobUser.getId(),"3");
                     mnMap.put("classify","政策发布");
                     mnMap.put("classifyId","3");
-                    mnMap.put("newMessage",newNum);
-                    mnMap.put("num",0);
+                    mnMap.put("newMessage",mn);
+                    mnMap.put("num",newNum);
 
                     resultList.add(mnMap);
                 }else if("4".equals(classify)){
@@ -248,13 +248,15 @@ public class MessageNoticeApiController {
 
             User createUser = userService.get(mc.getCreateBy());
             JobUser createJobUser = jobUserService.get(mc.getCreateBy());
-            if(createJobUser != null) {
+            String companyId = "";
+            if(createUser != null) {
                 mc.setCreateByN(createUser.getRealName());
+                companyId = createUser.getCompanyId();
             } else if (createJobUser != null) {
                 mc.setCreateByN(createJobUser.getRealName());
             }
 
-            Company company = companyService.get(createUser.getCompanyId());
+            Company company = companyService.get(companyId);
             if(company != null){
                 String scaleName = dataDictionaryService.getName(company.getScale());
                 company.setScaleName(scaleName);
@@ -352,10 +354,14 @@ public class MessageNoticeApiController {
             if(isAgree){
                 if(StringUtils.isNotEmpty(messageNotice.getDeliverId())){
                     ResumeDeliver resumeDeliver = resumeDeliverService.get(messageNotice.getDeliverId());
-                    String chatStatus = resumeDeliver.getChatStatus();
-                    int chatStatusNum = Integer.parseInt(chatStatus) + 1;
+                    ResumeDeliverContent resumeDeliverContent = resumeDeliverContentService.findTopByDeliverId(messageNotice.getDeliverId());
+                    String chatStatus = resumeDeliverContent.getChatStatus();
+                    String nextChatStatus = chatStatus;
+                    if("4".equals(chatStatus)) {
+                        nextChatStatus = "5";
+                    }
 
-                    resumeDeliver.setChatStatus(String.valueOf(chatStatusNum));
+                    resumeDeliver.setChatStatus(nextChatStatus);
                     resumeDeliver.setUpdateBy(subject);
                     resumeDeliver.setUpdateTime(new Date());
                     resumeDeliverService.update(resumeDeliver);
@@ -454,22 +460,22 @@ public class MessageNoticeApiController {
                 if("1".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
                     MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(sysUser.getId(),"1");
-                    int newNum = messageNoticeService.findNotRead(sysUser.getId(),"3");
+                    int newNum = messageNoticeService.findNotRead(sysUser.getId(),"1");
                     mnMap.put("classify","系统消息");
                     mnMap.put("classifyId","1");
-                    mnMap.put("newMessage",newNum);
-                    mnMap.put("num",0);
+                    mnMap.put("newMessage",mn);
+                    mnMap.put("num",newNum);
 
                     resultList.add(mnMap);
                 }else if("2".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
                     //job_resume_deliver_content
                     ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(sysUser.getId());
-
+                    int newNum = messageNoticeService.findNotRead(sysUser.getId(),"2");
                     mnMap.put("classify","求职消息");
                     mnMap.put("classifyId","2");
                     mnMap.put("newMessage",rdc);
-                    mnMap.put("num",0);
+                    mnMap.put("num",newNum);
 
                     resultList.add(mnMap);
                 }else if("3".equals(classify)){
@@ -478,8 +484,8 @@ public class MessageNoticeApiController {
                     int newNum = messageNoticeService.findNotRead(sysUser.getId(),"3");
                     mnMap.put("classify","政策发布");
                     mnMap.put("classifyId","3");
-                    mnMap.put("newMessage",newNum);
-                    mnMap.put("num",0);
+                    mnMap.put("newMessage",mn);
+                    mnMap.put("num",newNum);
 
                     resultList.add(mnMap);
                 }else if("5".equals(classify)){
@@ -514,4 +520,27 @@ public class MessageNoticeApiController {
 
         return messageResult;
     }
+
+
+    @PostMapping("readMessageNum")
+    @ApiOperation(value = "未读消息数量")
+    public MessageResult<Integer> readMessageNum(
+            String token,
+            @RequestAttribute  String subject) {
+        MessageResult<Integer> messageResult = new MessageResult<>();
+        List<Map> resultList = new ArrayList<>();
+        try {
+            Integer newNum = messageNoticeService.findNotRead(subject,null);
+
+            messageResult.setData(newNum);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResumeApiController.java

@@ -644,7 +644,7 @@ public class ResumeApiController {
                 resume.setUserTel(jobUser.getTel());
                 resume.setUserPhoto(jobUser.getHeadImageUrl());
                 resume.setUserAddress(jobUser.getAddress());
-                resume.setUserAge(String.valueOf(getAge(jobUser.getBirthday())));
+                resume.setUserAge(String.valueOf(getAge(resume.getBirthday())));
                 resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别", resume.getSex()));
                 resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
                 resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));

web/src/main/java/com/jpsoft/employment/modules/sys/controller/PermissionController.java

@@ -0,0 +1,310 @@
+package com.jpsoft.employment.modules.sys.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.sys.entity.Permission;
+import com.jpsoft.employment.modules.sys.service.PermissionService;
+import com.jpsoft.employment.modules.sys.service.RolePermissionService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/sys/permission")
+public class PermissionController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PermissionService permissionService;
+
+    @Autowired
+    private RolePermissionService rolePermissionService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Permission> create(){
+        MessageResult<Permission> msgResult = new MessageResult<>();
+
+        Permission permission = new Permission();
+
+        msgResult.setData(permission);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="批量导入")
+    @PostMapping("batchImport")
+    public MessageResult<Integer> batchImport(@RequestBody List<Permission> permList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (Permission permission : permList) {
+                if(!permissionService.exist(permission.getPath(),permission.getMethod())){
+                    permission.setId(UUID.randomUUID().toString());
+                    permission.setDelFlag(false);
+                    permission.setCreateBy(subject);
+                    permission.setCreateTime(new Date());
+
+                    affectCount += permissionService.insert(permission);
+                }
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("未导入新记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<Permission> add(@RequestBody Permission permission,@RequestAttribute String subject){
+        MessageResult<Permission> msgResult = new MessageResult<>();
+
+        try {
+            permission.setId(UUID.randomUUID().toString());
+            permission.setDelFlag(false);
+            permission.setCreateBy(subject);
+            permission.setCreateTime(new Date());
+            
+            int affectCount = permissionService.insert(permission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(permission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<Permission> edit(@PathVariable("id") String id){
+        MessageResult<Permission> msgResult = new MessageResult<>();
+
+        try {
+            Permission permission = permissionService.get(id);
+
+            if (permission != null) {
+                msgResult.setResult(true);
+                msgResult.setData(permission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<Permission> update(@RequestBody Permission permission,@RequestAttribute String subject){
+        MessageResult<Permission> msgResult = new MessageResult<>();
+
+        try {
+            permission.setUpdateBy(subject);
+            permission.setUpdateTime(new Date());
+            
+            int affectCount = permissionService.update(permission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(permission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Permission permission = permissionService.get(id);
+            permission.setDelFlag(true);
+            permission.setUpdateBy(subject);
+            permission.setUpdateTime(new Date());
+
+            int affectCount = permissionService.update(permission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取所有权限")
+    @GetMapping(value = "selectAll")
+    public MessageResult<List> selectAll(){
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        try {
+            List<Permission> perms = permissionService.list();
+
+            msgResult.setResult(true);
+            msgResult.setData(perms);
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                Permission permission = permissionService.get(id);
+                permission.setDelFlag(true);
+                permission.setUpdateBy(subject);
+                permission.setUpdateTime(new Date());
+
+                affectCount += permissionService.update(permission);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String path,
+            @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
+            @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("path_","asc"));
+
+        if (StringUtils.isNotEmpty(path)) {
+            searchParams.put("path","%" + path + "%");
+        }
+
+        Page<Permission> page = permissionService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @PostMapping("hasPermission")
+    @ApiOperation(value="是否拥有权限")
+    public MessageResult<String> hasPermission(String path,String method,@RequestAttribute String subject){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            String data = null;
+
+            String userId = subject;
+
+            boolean permitted = permissionService.hasPermitted(userId, path, method);
+
+            messageResult.setResult(permitted);
+
+            if (!permitted){
+                messageResult.setMessage("当前用户无权限访问该接口!");
+            }
+        }
+        catch (Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+}

web/src/main/resources/application-dev.yml

@@ -5,16 +5,15 @@ server:
 
 spring:
   datasource:
-
     #开发环境
-#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft2016
+     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft2016
 
     #测试环境
-     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft8121234
+     #url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     #username: root
+     #password: jpsoft8121234
 
     #正式环境
       #url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/enterprise_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8