受邀信息列表，报名信息列表

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

@@ -46,4 +46,11 @@ public class EnterpriseInfo {
 
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+
+	@ApiModelProperty(value = "企业地址")
+	private String address;
+
+	@ApiModelProperty(value = "联系人ID")
+	private String contactsPersonId;
 }

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

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -45,4 +46,13 @@ public class JobEnterpriseRelation {
 
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+	@Transient
+	@ApiModelProperty(value = "企业名称")
+	private String enterpriseName;
+
+	@Transient
+	@ApiModelProperty(value = "企业地址")
+	private String enterpriseAddress;
+
 }

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

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -43,4 +44,25 @@ public class RecruitPersonRelation {
 
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+
+
+	@Transient
+	@ApiModelProperty(value = "用工人员姓名")
+	private String workPersonName;
+
+	@Transient
+	@ApiModelProperty(value = "联系电话")
+	private String phone;
+
+	@Transient
+	@ApiModelProperty(value = "身份证号")
+	private String idCard;
+
+	@Transient
+	@ApiModelProperty(value = "性别")
+	private String gender;
+
+	@Transient
+	@ApiModelProperty(value = "年龄")
+	private Integer age;
 }

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

@@ -13,6 +13,8 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="address" column="address_" />
+			<result property="contactsPersonId" column="contacts_person_id" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.EnterpriseInfo">
 	<!--
@@ -22,7 +24,7 @@
 	-->
 	<![CDATA[
 		insert into base_enterprise_info
-	    (id_,name_,license_image,status_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,name_,license_image,status_,create_by,create_time,update_by,update_time,del_flag,address_.contacts_person_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -34,6 +36,8 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{address,jdbcType=VARCHAR}
+,#{contactsPersonId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -67,6 +71,12 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="address!=null">
+				address_=#{address,jdbcType=VARCHAR},
+			</if>
+			<if test="contactsPersonId!=null">
+				contacts_person_id=#{contactsPersonId,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -77,11 +77,13 @@ id_,job_information_id,enterprise_id,create_by,create_time,update_by,update_time
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="JobEnterpriseRelationMap">
 		<![CDATA[
-			select * from base_job_enterprise_relation
+			select * from base_job_enterprise_relation a
+			inner join base_enterprise_info b on a.enterprise_id=b.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			a.del_flag = false
+			<if test="searchParams.informationId != null">
+				and a.job_information_id = #{searchParams.informationId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -77,11 +77,19 @@ id_,work_person_id,recruit_information_id,create_by,create_time,update_by,update
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="RecruitPersonRelationMap">
 		<![CDATA[
-			select * from base_recruit_person_relation
+			select a.* from base_recruit_person_relation a
+			inner join base_person_info b on a.work_person_id=b.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			a.del_flag = false
+			<if test="searchParams.informationId != null">
+				and a.recruit_information_id = #{searchParams.informationId}
+			</if>
+			<if test="searchParams.name != null">
+				and b.real_name like #{searchParams.name}
+			</if>
+			<if test="searchParams.phone != null">
+				and b.phone_ like #{searchParams.phone}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -1,6 +1,8 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.EnterpriseInfo;
+import com.jpsoft.employment.modules.base.service.EnterpriseInfoService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -25,6 +27,9 @@ public class JobEnterpriseRelationController {
 
     @Autowired
     private JobEnterpriseRelationService jobEnterpriseRelationService;
+
+    @Autowired
+    private EnterpriseInfoService enterpriseInfoService;
 	
 	
 	@ApiOperation(value="创建空记录")
@@ -196,7 +201,7 @@ public class JobEnterpriseRelationController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String informationId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -210,15 +215,23 @@ public class JobEnterpriseRelationController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(informationId)) {
+            searchParams.put("informationId", informationId);
         }
 
 
         Page<JobEnterpriseRelation> page = jobEnterpriseRelationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (JobEnterpriseRelation jobEnterpriseRelation:page) {
+            EnterpriseInfo enterpriseInfo = enterpriseInfoService.get(jobEnterpriseRelation.getEnterpriseId());
+            if(enterpriseInfo!=null){
+                jobEnterpriseRelation.setEnterpriseName(enterpriseInfo.getName());
+                jobEnterpriseRelation.setEnterpriseAddress(enterpriseInfo.getAddress());
+            }
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -1,6 +1,10 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.PersonInfo;
+import com.jpsoft.employment.modules.base.entity.RecruitInformationInfo;
+import com.jpsoft.employment.modules.base.service.PersonInfoService;
+import com.jpsoft.employment.modules.base.service.RecruitInformationInfoService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -24,11 +28,14 @@ public class RecruitPersonRelationController {
 
     @Autowired
     private RecruitPersonRelationService recruitPersonRelationService;
-	
-	
-	@ApiOperation(value="创建空记录")
+
+    @Autowired
+    private PersonInfoService personInfoService;
+
+
+    @ApiOperation(value = "创建空记录")
     @GetMapping("create")
-    public MessageResult<RecruitPersonRelation> create(){
+    public MessageResult<RecruitPersonRelation> create() {
         MessageResult<RecruitPersonRelation> msgResult = new MessageResult<>();
 
         RecruitPersonRelation recruitPersonRelation = new RecruitPersonRelation();
@@ -39,14 +46,14 @@ public class RecruitPersonRelationController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
+    @ApiOperation(value = "添加信息")
     @PostMapping("add")
-    public MessageResult<RecruitPersonRelation> add(@RequestBody RecruitPersonRelation recruitPersonRelation,@RequestAttribute String subject){
+    public MessageResult<RecruitPersonRelation> add(@RequestBody RecruitPersonRelation recruitPersonRelation, @RequestAttribute String subject) {
         MessageResult<RecruitPersonRelation> msgResult = new MessageResult<>();
 
         try {
             recruitPersonRelation.setId(UUID.randomUUID().toString());
-			recruitPersonRelation.setDelFlag(false);
+            recruitPersonRelation.setDelFlag(false);
             recruitPersonRelation.setCreateBy(subject);
             recruitPersonRelation.setCreateTime(new Date());
 
@@ -59,9 +66,8 @@ public class RecruitPersonRelationController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -70,9 +76,9 @@ public class RecruitPersonRelationController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value = "获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<RecruitPersonRelation> edit(@PathVariable("id") String id){
+    public MessageResult<RecruitPersonRelation> edit(@PathVariable("id") String id) {
         MessageResult<RecruitPersonRelation> msgResult = new MessageResult<>();
 
         try {
@@ -85,9 +91,8 @@ public class RecruitPersonRelationController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -96,15 +101,15 @@ public class RecruitPersonRelationController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value = "更新用户")
     @PostMapping("update")
-    public MessageResult<RecruitPersonRelation> update(@RequestBody RecruitPersonRelation recruitPersonRelation,@RequestAttribute String subject){
+    public MessageResult<RecruitPersonRelation> update(@RequestBody RecruitPersonRelation recruitPersonRelation, @RequestAttribute String subject) {
         MessageResult<RecruitPersonRelation> msgResult = new MessageResult<>();
 
         try {
-		    recruitPersonRelation.setUpdateBy(subject);
+            recruitPersonRelation.setUpdateBy(subject);
             recruitPersonRelation.setUpdateTime(new Date());
-		
+
             int affectCount = recruitPersonRelationService.update(recruitPersonRelation);
 
             if (affectCount > 0) {
@@ -114,9 +119,8 @@ public class RecruitPersonRelationController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库更新失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -125,19 +129,19 @@ public class RecruitPersonRelationController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+    @ApiOperation(value = "删除用户")
     @PostMapping("delete/{id}")
-    public MessageResult<RecruitPersonRelation> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<RecruitPersonRelation> delete(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<RecruitPersonRelation> msgResult = new MessageResult<>();
 
         try {
-			
-			RecruitPersonRelation recruitPersonRelation = recruitPersonRelationService.get(id);
+
+            RecruitPersonRelation recruitPersonRelation = recruitPersonRelationService.get(id);
             recruitPersonRelation.setDelFlag(true);
             recruitPersonRelation.setUpdateBy(subject);
             recruitPersonRelation.setUpdateTime(new Date());
-			
-			int affectCount = recruitPersonRelationService.update(recruitPersonRelation);
+
+            int affectCount = recruitPersonRelationService.update(recruitPersonRelation);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -145,9 +149,8 @@ public class RecruitPersonRelationController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -157,9 +160,9 @@ public class RecruitPersonRelationController {
     }
 
 
-    @ApiOperation(value="批量删除")
+    @ApiOperation(value = "批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -181,9 +184,8 @@ public class RecruitPersonRelationController {
                 msgResult.setResult(false);
                 msgResult.setMessage("删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -192,31 +194,50 @@ public class RecruitPersonRelationController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @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,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            String informationId, String name, String phone,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.create_time", "desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(informationId)) {
+            searchParams.put("informationId", informationId);
         }
 
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name", name + "%");
+        }
 
-        Page<RecruitPersonRelation> page = recruitPersonRelationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        if (StringUtils.isNotEmpty(phone)) {
+            searchParams.put("phone", phone + "%");
+        }
+
+
+        Page<RecruitPersonRelation> page = recruitPersonRelationService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+
+        for (RecruitPersonRelation recruitPersonRelation:page) {
+            PersonInfo personInfo = personInfoService.get(recruitPersonRelation.getWorkPersonId());
+            if(personInfo!=null){
+                recruitPersonRelation.setWorkPersonName(personInfo.getRealName());
+                recruitPersonRelation.setPhone(personInfo.getPhone());
+                recruitPersonRelation.setIdCard(personInfo.getIdCard());
+                recruitPersonRelation.setAge(personInfo.getAge());
+                recruitPersonRelation.setGender(personInfo.getGender());
+            }
+        }
 
 
         msgResult.setResult(true);