接口及调整

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/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(String companyId);
+
+	int findPositionNumber(String companyId);
+
+	int findSexNumber(String sex,String companyId);
 }

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/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/manage/dao/JobFairCompanyDAO.java

@@ -16,4 +16,6 @@ public interface JobFairCompanyDAO {
 	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/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/entity/JobFairCompany.java

@@ -34,10 +34,18 @@ public class JobFairCompany {
     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 = "联系人")

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

@@ -48,4 +48,12 @@ public class SeatManage {
     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/JobFairCompanyService.java

@@ -14,4 +14,6 @@ public interface JobFairCompanyService {
 	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/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/impl/JobFairCompanyServiceImpl.java

@@ -68,4 +68,9 @@ public class JobFairCompanyServiceImpl implements JobFairCompanyService {
         
         return page;
 	}
+
+	@Override
+	public List<JobFairCompany> findByFairId(String fairId){
+		return jobFairCompanyDAO.findByFairId(fairId);
+	}
 }

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/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[

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/manage/JobFairCompany.xml

@@ -16,6 +16,8 @@
 			<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">
 	<!--
@@ -96,16 +98,35 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="JobFairCompanyMap">
 		<![CDATA[
-			select * from manage_job_fair_company
+			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>
-			del_flag = 0
+			a.del_flag = 0
 			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+				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 * from manage_job_fair_company
+			where del_flag = 0
+			and job_fair_id =#{fairId}
+		order by create_time
+	</select>
 </mapper>

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

@@ -17,6 +17,8 @@
 			<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">
 	<!--
@@ -27,7 +29,7 @@
 	<![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_)
+	    status_,start_time,end_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -43,6 +45,8 @@
 ,#{imgUrls,jdbcType= NUMERIC }
 ,#{videoUrl,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
 		)
 	]]>
 	</insert>
@@ -88,6 +92,12 @@
 			<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>

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>

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

@@ -64,6 +64,10 @@ 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")
 		;
 
 

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/JobFairCompanyController.java

@@ -4,6 +4,8 @@ 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;
@@ -26,6 +28,8 @@ public class JobFairCompanyController {
 
     @Autowired
     private JobFairCompanyService jobFairCompanyService;
+    @Autowired
+    private RecruitmentService recruitmentService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -197,6 +201,8 @@ public class JobFairCompanyController {
     @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){
@@ -209,13 +215,25 @@ public class JobFairCompanyController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.create_time","asc"));
+
+        searchParams.put("jobFairId",jobFairId);
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        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));

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/mobile/controller/DataScreenApiController.java

@@ -0,0 +1,217 @@
+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.Recruitment;
+import com.jpsoft.employment.modules.job.service.RecruitmentService;
+import com.jpsoft.employment.modules.job.service.UserBrowseService;
+import com.jpsoft.employment.modules.job.service.UserCollectionService;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+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;
+
+    @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);
+            for(JobFairCompany jobFairCompany : jobFairCompanyList){
+                String[] recruitmentIds = jobFairCompany.getRecruitmentIds().split(",");
+                jobFairCompany.setRecruitmentNums(recruitmentIds.length);
+            }
+
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            dataMap.put("jobFair", jobFair);
+            dataMap.put("jobFairCompanyList", jobFairCompanyList);
+
+            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<Company> companyList = companyService.list();
+            List<Recruitment> recruitmentList = recruitmentService.listByApproved();
+
+            recruitsNum = recruitmentService.findPositionNumber(null);
+
+            manNum = recruitmentService.findSexNumber("1",null);
+
+            womanNum = recruitmentService.findSexNumber("0",null);
+
+
+            Map<String, Object> dataMap = new HashMap<String, Object>();
+            //入住企业数
+            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);
+
+
+            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;
+    }
+}