Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/enterprise/modules/base/dao/RecruitInfoDAO.java

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

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/CompanyInfoDetailDTO.java

@@ -32,5 +32,9 @@ public class CompanyInfoDetailDTO {
 
     private List<NewsInfoListDTO> newsInfoDTOList;
 
+    private String positionName;
 
 }
+
+
+

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/CompanyInfo.java

@@ -39,7 +39,7 @@ public class CompanyInfo {
     private String scaleN;
     @ApiModelProperty(value = "所属行业（1：计算机/IT，2：食品加工，3：服务业）")
     private String industry;
-    @ApiModelProperty(value = "字典：所属行业")
+    @ApiModelProperty(value = "所属行业翻译")
     private String industryName;
     @ApiModelProperty(value = "所在地区（1：荆州区，2：沙市区，3：开发区，4：石首市）")
     private String region;
@@ -63,4 +63,10 @@ public class CompanyInfo {
     private Date updateTime;
     @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+    @ApiModelProperty(value = "企联职务（数据字典:企联职务）")
+    private String position;
+    @ApiModelProperty(value = "企联职务（数据字典:企联职务）翻译")
+    private String positionName;
+    @ApiModelProperty(value = "是否为内部公司")
+    private Boolean inside = false;
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/PersonInfo.java

@@ -60,4 +60,10 @@ public class PersonInfo {
 
     @ApiModelProperty(value = "企业名称")
     private String companyName;
+    @ApiModelProperty(value = "用户头衔（数据字典:用户头衔）")
+    private String title;
+    @ApiModelProperty(value = "用户头衔翻译")
+    private String titleName;
+    @ApiModelProperty(value = "是否内部人员")
+    private Boolean inside = false;
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/RecruitInfo.java

@@ -0,0 +1,53 @@
+package com.jpsoft.enterprise.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_recruit_info的实体类
+ */
+@Data
+@ApiModel(value = "base_recruit_info的实体类")
+public class RecruitInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "公司id")
+    private String companyId;
+        @ApiModelProperty(value = "职务名称")
+    private String positionName;
+        @ApiModelProperty(value = "公司区域（数据字典：区域）")
+    private String workRegion;
+        @ApiModelProperty(value = "工作年限（数据字典：工作年限）")
+    private String workYear;
+        @ApiModelProperty(value = "学历（数据字典：学历）")
+    private String education;
+        @ApiModelProperty(value = "薪资水平（数据字典：薪资水平）")
+    private String salaryLevel;
+        @ApiModelProperty(value = "职务描述")
+    private String describe;
+        @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+        @ApiModelProperty(value = "状态是否上架")
+    private Boolean status;
+        @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;
+}

common/src/main/java/com/jpsoft/enterprise/modules/base/service/RecruitInfoService.java

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

common/src/main/java/com/jpsoft/enterprise/modules/base/service/impl/RecruitInfoServiceImpl.java

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

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

@@ -22,6 +22,8 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			<result property="industryName" column="industry_name" />
+			<result property="position" column="position_" />
+			<result property="inside" column="inside_"/>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.CompanyInfo">
 	<!--
@@ -31,7 +33,7 @@
 	-->
 	<![CDATA[
 		insert into base_company_info
-	    (id_,company_name,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,company_name,type_,logo_url,credit_code,address_,business_license_url,scale_,industry_,region_,company_introduction,enterpriser_introduction,create_by,create_time,update_by,update_time,del_flag,position_,inside_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -51,6 +53,8 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{position,jdbcType=VARCHAR}
+,#{inside,jdbcType=NUMERIC}
 		)
 	]]>
 	</insert>
@@ -108,6 +112,12 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="position!=null">
+				position_=#{position,jdbcType= VARCHAR },
+			</if>
+			<if test="inside!=null">
+				inside_=#{inside,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -150,6 +160,9 @@
 			<if test="searchParams.industry != null">
 				and a.industry_ = #{searchParams.industry}
 			</if>
+			<if test="searchParams.inside != null">
+				and a.inside_ = #{searchParams.inside}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -110,6 +110,9 @@
             <if test="searchParams.status != null">
                 and status_ = #{searchParams.status}
             </if>
+            <if test="searchParams.companyId != null">
+                and company_id = #{searchParams.companyId}
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}

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

@@ -23,6 +23,8 @@
 			<result property="remark" column="remark_" />
 			<result property="registerTypeName" column="register_type_name"/>
 			<result property="companyName" column="company_name"/>
+			<result property="title" column="title_"/>
+			<result property="inside" column="inside_"/>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.PersonInfo">
 	<!--
@@ -32,7 +34,7 @@
 	-->
 	<![CDATA[
 		insert into base_person_info
-	    (id_,person_name,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_)
+	    (id_,person_name,user_name,password_,open_id,id_card,face_image_url,company_id,register_type,phone_,id_card_url,create_by,create_time,update_by,update_time,del_flag,remark_,title_,inside_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -52,6 +54,8 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{remark,jdbcType=VARCHAR}
+,#{title,jdbcType=VARCHAR}
+,#{inside,jdbcType=NUMERIC}
 		)
 	]]>
 	</insert>
@@ -109,6 +113,12 @@
 				<if test="remark!=null">
 		remark_=#{remark,jdbcType=VARCHAR},
 		</if>
+			<if test="title!=null">
+				title_=#{title,jdbcType=VARCHAR},
+			</if>
+			<if test="inside!=null">
+				inside_=#{inside,jdbcType=NUMERIC},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -0,0 +1,126 @@
+<?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.enterprise.modules.base.dao.RecruitInfoDAO">
+	<resultMap id="RecruitInfoMap" type="com.jpsoft.enterprise.modules.base.entity.RecruitInfo">
+		<id property="id" column="id_" />
+			<result property="companyId" column="company_id" />
+			<result property="positionName" column="position_name" />
+			<result property="workRegion" column="work_region" />
+			<result property="workYear" column="work_year" />
+			<result property="education" column="education_" />
+			<result property="salaryLevel" column="salary_level" />
+			<result property="describe" column="describe_" />
+			<result property="contactPhone" column="contact_phone" />
+			<result property="status" column="status_" />
+			<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" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.RecruitInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_recruit_info
+	    (id_,company_id,position_name,work_region,work_year,education_,salary_level,describe_,contact_phone,status_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{positionName,jdbcType=VARCHAR}
+,#{workRegion,jdbcType=VARCHAR}
+,#{workYear,jdbcType=VARCHAR}
+,#{education,jdbcType=VARCHAR}
+,#{salaryLevel,jdbcType=VARCHAR}
+,#{describe,jdbcType= VARCHAR }
+,#{contactPhone,jdbcType=VARCHAR}
+,#{status,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_recruit_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.enterprise.modules.base.entity.RecruitInfo">
+		update base_recruit_info
+		<set>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="positionName!=null">
+		position_name=#{positionName,jdbcType=VARCHAR},
+		</if>
+				<if test="workRegion!=null">
+		work_region=#{workRegion,jdbcType=VARCHAR},
+		</if>
+				<if test="workYear!=null">
+		work_year=#{workYear,jdbcType=VARCHAR},
+		</if>
+				<if test="education!=null">
+		education_=#{education,jdbcType=VARCHAR},
+		</if>
+				<if test="salaryLevel!=null">
+		salary_level=#{salaryLevel,jdbcType=VARCHAR},
+		</if>
+				<if test="describe!=null">
+		describe_=#{describe,jdbcType= VARCHAR },
+		</if>
+				<if test="contactPhone!=null">
+		contact_phone=#{contactPhone,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType= NUMERIC },
+		</if>
+				<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>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="RecruitInfoMap">
+		select 
+id_,company_id,position_name,work_region,work_year,education_,salary_level,describe_,contact_phone,status_,create_by,create_time,update_by,update_time,del_flag		from base_recruit_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_recruit_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="RecruitInfoMap">
+		select * from base_recruit_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="RecruitInfoMap">
+		<![CDATA[
+			select * from base_recruit_info
+		]]>
+		<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/enterprise/modules/base/controller/CompanyInfoController.java

@@ -268,6 +268,8 @@ public class CompanyInfoController {
             ci.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("企业类型",ci.getType()));
             ci.setScaleN(dataDictionaryService.findNameByCatalogNameAndValue("企业规模",ci.getScale()));
             ci.setRegionN(dataDictionaryService.findNameByCatalogNameAndValue("区域",ci.getRegion()));
+            ci.setPositionName(dataDictionaryService.findNameByCatalogNameAndValue("企联职务",ci.getPosition()));
+
         }
 
         msgResult.setResult(true);

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/PersonInfoController.java

@@ -275,6 +275,7 @@ public class PersonInfoController {
         Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(PersonInfo pi : page.getResult()){
             pi.setRegisterTypeName(dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型",pi.getRegisterType()));
+            pi.setTitleName(dataDictionaryService.findNameByCatalogNameAndValue("用户头衔",pi.getTitle()));
         }
 
         msgResult.setResult(true);

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/RecruitInfoController.java

@@ -0,0 +1,229 @@
+package com.jpsoft.enterprise.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.enterprise.modules.common.dto.MessageResult;
+import com.jpsoft.enterprise.modules.common.dto.Sort;
+import com.jpsoft.enterprise.modules.base.entity.RecruitInfo;
+import com.jpsoft.enterprise.modules.base.service.RecruitInfoService;
+import com.jpsoft.enterprise.modules.common.utils.PojoUtils;
+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.*;
+
+/**
+ * 公司招聘信息
+ * sz
+ */
+@RestController
+@RequestMapping("/base/recruitInfo")
+@Api(description = "recruitInfo")
+public class RecruitInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private RecruitInfoService recruitInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<RecruitInfo> create(){
+        MessageResult<RecruitInfo> msgResult = new MessageResult<>();
+
+        RecruitInfo recruitInfo = new RecruitInfo();
+
+        msgResult.setData(recruitInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<RecruitInfo> add(@RequestBody RecruitInfo recruitInfo,@RequestAttribute String subject){
+        MessageResult<RecruitInfo> msgResult = new MessageResult<>();
+
+        try {
+            recruitInfo.setId(UUID.randomUUID().toString());
+            recruitInfo.setDelFlag(false);
+            recruitInfo.setCreateBy(subject);
+            recruitInfo.setCreateTime(new Date());
+            
+            int affectCount = recruitInfoService.insert(recruitInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(recruitInfo);
+            } 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<RecruitInfo> edit(@PathVariable("id") String id){
+        MessageResult<RecruitInfo> msgResult = new MessageResult<>();
+
+        try {
+            RecruitInfo recruitInfo = recruitInfoService.get(id);
+
+            if (recruitInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(recruitInfo);
+            } 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<RecruitInfo> update(@RequestBody RecruitInfo recruitInfo,@RequestAttribute String subject){
+        MessageResult<RecruitInfo> msgResult = new MessageResult<>();
+
+        try {
+            recruitInfo.setUpdateBy(subject);
+            recruitInfo.setUpdateTime(new Date());
+            
+            int affectCount = recruitInfoService.update(recruitInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(recruitInfo);
+            } 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 {
+            RecruitInfo recruitInfo = recruitInfoService.get(id);
+            recruitInfo.setDelFlag(true);
+            recruitInfo.setUpdateBy(subject);
+            recruitInfo.setUpdateTime(new Date());
+
+            int affectCount = recruitInfoService.update(recruitInfo);
+
+            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) {
+                RecruitInfo recruitInfo = recruitInfoService.get(id);
+                recruitInfo.setDelFlag(true);
+                recruitInfo.setUpdateBy(subject);
+                recruitInfo.setUpdateTime(new Date());
+
+                affectCount += recruitInfoService.update(recruitInfo);
+            }
+
+            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<RecruitInfo> page = recruitInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/CompanyInfoApiController.java

@@ -198,6 +198,7 @@ public class CompanyInfoApiController {
             if (StringUtils.isNotBlank(industry)) {
                 searchParams.put("industry", industry);
             }
+            searchParams.put("inside",0);
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time", "desc"));

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/CooperationInfoApiController.java

@@ -22,15 +22,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author 墨鱼_mo
@@ -57,51 +51,50 @@ public class CooperationInfoApiController {
     @PostMapping("cooperationInfoList")
     @ApiOperation(value = "互助信息列表(公开接口)")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "type", required = true, paramType = "form")
+            @ApiImplicitParam(name = "type", value = "type(1:闲置资源，2：企业需求)", required = true, paramType = "form")
     })
-    public MessageResult<Map> cooperationInfoList(String type,@RequestParam(value="pageIndex",defaultValue="1") int pageIndex, @RequestParam(value="pageSize",defaultValue="10") int pageSize) {
+    public MessageResult<Map> cooperationInfoList(String type, @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         MessageResult<Map> messageResult = new MessageResult<>();
 
         try {
             List<CooperationInfoListDTO> list = new ArrayList<>();
 
 
-
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("type",type);
-            searchParams.put("status",1);
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("type", type);
+            searchParams.put("status", 1);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
+            sortList.add(new Sort("create_time", "desc"));
 
-            Page<CooperationInfo> page = cooperationInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+            Page<CooperationInfo> page = cooperationInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
             List<CooperationInfo> cooperationInfoList = page.getResult();
-            if (cooperationInfoList.size()>0){
-                for (CooperationInfo cooperationInfo : cooperationInfoList){
+            if (cooperationInfoList.size() > 0) {
+                for (CooperationInfo cooperationInfo : cooperationInfoList) {
                     CooperationInfoListDTO cooperationInfoListDTO = new CooperationInfoListDTO();
-                    BeanUtils.copyProperties(cooperationInfo,cooperationInfoListDTO);
+                    BeanUtils.copyProperties(cooperationInfo, cooperationInfoListDTO);
                     CompanyInfo companyInfo = companyInfoService.get(cooperationInfo.getCompanyId());
-                    if (companyInfo != null){
+                    if (companyInfo != null) {
                         cooperationInfoListDTO.setCompanyName(companyInfo.getCompanyName());
-                        cooperationInfoListDTO.setCreateTime(DateUtil.format(cooperationInfo.getCreateTime(),"yyyy-MM-dd HH:mm"));
+                        cooperationInfoListDTO.setCreateTime(DateUtil.format(cooperationInfo.getCreateTime(), "yyyy-MM-dd HH:mm"));
                         list.add(cooperationInfoListDTO);
                     }
                 }
             }
 
-            Map<String,Object> pageMap = new HashMap<>();
+            Map<String, Object> pageMap = new HashMap<>();
 
-            pageMap.put("recordsTotal",page.getTotal());
-            pageMap.put("recordsFiltered",page.getTotal());
-            pageMap.put("totalPage",page.getPages());
-            pageMap.put("pageNumber",page.getPageNum());
-            pageMap.put("pageSize",page.getPageSize());
+            pageMap.put("recordsTotal", page.getTotal());
+            pageMap.put("recordsFiltered", page.getTotal());
+            pageMap.put("totalPage", page.getPages());
+            pageMap.put("pageNumber", page.getPageNum());
+            pageMap.put("pageSize", page.getPageSize());
             pageMap.put("data", list);
 
             messageResult.setData(pageMap);
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage(),ex);
+            log.error(ex.getMessage(), ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -122,20 +115,20 @@ public class CooperationInfoApiController {
 
             CooperationInfo cooperationInfo = cooperationInfoService.get(id);
             CooperationInfoDTO cooperationInfoDTO = new CooperationInfoDTO();
-            if (cooperationInfo != null){
-                BeanUtils.copyProperties(cooperationInfo,cooperationInfoDTO);
+            if (cooperationInfo != null) {
+                BeanUtils.copyProperties(cooperationInfo, cooperationInfoDTO);
                 CompanyInfo companyInfo = companyInfoService.get(cooperationInfo.getCompanyId());
-                if (companyInfo != null){
+                if (companyInfo != null) {
                     cooperationInfoDTO.setCompanyName(companyInfo.getCompanyName());
                     cooperationInfoDTO.setCompanyLogo(companyInfo.getLogoUrl());
                 }
                 PersonInfo personInfo = personInfoService.get(cooperationInfo.getCreateBy());
-                if (personInfo != null){
+                if (personInfo != null) {
                     cooperationInfoDTO.setPersonName(personInfo.getPersonName());
                 }
 
-                cooperationInfoDTO.setCreateTime(DateUtil.format(cooperationInfo.getCreateTime(),"yyyy-MM-dd"));
-                String typeName = dataDictionaryService.findNameByCatalogNameAndValue("互助类型",cooperationInfo.getType());
+                cooperationInfoDTO.setCreateTime(DateUtil.format(cooperationInfo.getCreateTime(), "yyyy-MM-dd"));
+                String typeName = dataDictionaryService.findNameByCatalogNameAndValue("互助类型", cooperationInfo.getType());
                 cooperationInfoDTO.setTypeName(typeName);
             }
 
@@ -144,7 +137,156 @@ public class CooperationInfoApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage(),ex);
+            log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+
+    @PostMapping("cooperationInfoListForOwn")
+    @ApiOperation(value = "个人互助信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "type(1:闲置资源，2：企业需求)", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "token", value = "令牌", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "subject", value = "目标(不传)", paramType = "form")
+    })
+    public MessageResult<Map> cooperationInfoListForOwn(String type, String token, @RequestAttribute String subject, @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        MessageResult<Map> messageResult = new MessageResult<>();
+
+        try {
+            List<CooperationInfoListDTO> list = new ArrayList<>();
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("用户不存在");
+            }
+            CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+            if (companyInfo == null) {
+                throw new Exception("公司信息有误");
+            }
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("type", type);
+            searchParams.put("status", 1);
+            searchParams.put("companyId", companyInfo.getId());
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time", "desc"));
+
+            Page<CooperationInfo> page = cooperationInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+            List<CooperationInfo> cooperationInfoList = page.getResult();
+            if (cooperationInfoList.size() > 0) {
+                for (CooperationInfo cooperationInfo : cooperationInfoList) {
+                    CooperationInfoListDTO cooperationInfoListDTO = new CooperationInfoListDTO();
+                    BeanUtils.copyProperties(cooperationInfo, cooperationInfoListDTO);
+
+                    cooperationInfoListDTO.setCompanyName(companyInfo.getCompanyName());
+                    cooperationInfoListDTO.setCreateTime(DateUtil.format(cooperationInfo.getCreateTime(), "yyyy-MM-dd HH:mm"));
+                    list.add(cooperationInfoListDTO);
+
+                }
+            }
+
+            Map<String, Object> pageMap = new HashMap<>();
+
+            pageMap.put("recordsTotal", page.getTotal());
+            pageMap.put("recordsFiltered", page.getTotal());
+            pageMap.put("totalPage", page.getPages());
+            pageMap.put("pageNumber", page.getPageNum());
+            pageMap.put("pageSize", page.getPageSize());
+            pageMap.put("data", list);
+
+            messageResult.setData(pageMap);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("submitCooperationInfo")
+    @ApiOperation(value = "个人互助信息提交")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "type(1:闲置资源，2：企业需求)", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "token", value = "令牌", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "subject", value = "目标(不传)", paramType = "form"),
+            @ApiImplicitParam(name = "content", value = "内容", required = true, paramType = "form")
+    })
+    public MessageResult<Map> submitCooperationInfo(String type, String token, @RequestAttribute String subject,String content) {
+        MessageResult<Map> messageResult = new MessageResult<>();
+
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("用户不存在");
+            }
+            CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+            if (companyInfo == null) {
+                throw new Exception("公司信息有误");
+            }
+            CooperationInfo cooperationInfo = new CooperationInfo();
+            cooperationInfo.setId(UUID.randomUUID().toString());
+            cooperationInfo.setCompanyId(companyInfo.getId());
+            cooperationInfo.setType(type);
+            cooperationInfo.setContent(content);
+            cooperationInfo.setCreateBy(personInfo.getId());
+            cooperationInfo.setCreateTime(new Date());
+            cooperationInfo.setDelFlag(false);
+            cooperationInfo.setStatus(true);
+            cooperationInfoService.insert(cooperationInfo);
+
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("deleteCooperationInfo")
+    @ApiOperation(value = "个人互助信息删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "token", value = "令牌", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "subject", value = "目标(不传)", paramType = "form")
+    })
+    public MessageResult<Map> deleteCooperationInfo(String id, String token, @RequestAttribute String subject) {
+        MessageResult<Map> messageResult = new MessageResult<>();
+
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("用户不存在");
+            }
+            CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+            if (companyInfo == null) {
+                throw new Exception("公司信息有误");
+            }
+            CooperationInfo cooperationInfo = cooperationInfoService.get(id);
+            if (cooperationInfo != null){
+                cooperationInfo.setDelFlag(true);
+                cooperationInfo.setUpdateBy(personInfo.getId());
+                cooperationInfo.setUpdateTime(new Date());
+                cooperationInfoService.update(cooperationInfo);
+            }
+
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/PersonInfoApiController.java

@@ -182,6 +182,15 @@ public class PersonInfoApiController {
 
             String token = JwtUtil.createToken(jwtSecret, personInfo.getId() + "", DateUtil.offsetHour(new Date(), 6));
 
+
+            if (StringUtils.isNotBlank(personInfo.getRegisterType())){
+                String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
+                personInfo.setRegisterTypeName(registerTypeName);
+            }
+            if (StringUtils.isNotBlank(personInfo.getTitle())){
+                String titleName = dataDictionaryService.findNameByCatalogNameAndValue("用户头衔",personInfo.getTitle());
+                personInfo.setTitleName(titleName);
+            }
             Map<String, Object> dataMap = new HashMap<String, Object>();
             dataMap.put("personInfo", personInfo);
             dataMap.put("token", token);
@@ -249,6 +258,15 @@ public class PersonInfoApiController {
 
                 String token = JwtUtil.createToken(jwtSecret, personInfo.getId() + "", DateUtil.offsetHour(new Date(), 6));
 
+                if (StringUtils.isNotBlank(personInfo.getRegisterType())){
+                    String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
+                    personInfo.setRegisterTypeName(registerTypeName);
+                }
+                if (StringUtils.isNotBlank(personInfo.getTitle())){
+                    String titleName = dataDictionaryService.findNameByCatalogNameAndValue("用户头衔",personInfo.getTitle());
+                    personInfo.setTitleName(titleName);
+                }
+
                 dataMap.put("personInfo", personInfo);
                 dataMap.put("token", token);
                 dataMap.put("companyInfo", companyInfoDetailDTO);
@@ -353,8 +371,16 @@ public class PersonInfoApiController {
                 PersonInfo personInfo = personInfoService.findByOpenId(openId);
                 if (personInfo != null) {
                     String token = JwtUtil.createToken(jwtSecret, personInfo.getId() + "", DateUtil.offsetHour(new Date(), 6));
-                    String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
-                    personInfo.setRegisterTypeName(registerTypeName);
+                    if (StringUtils.isNotBlank(personInfo.getRegisterType())){
+                        String registerTypeName = dataDictionaryService.findNameByCatalogNameAndValue("注册用户类型", personInfo.getRegisterType());
+                        personInfo.setRegisterTypeName(registerTypeName);
+                    }
+                    if (StringUtils.isNotBlank(personInfo.getTitle())){
+                        String titleName = dataDictionaryService.findNameByCatalogNameAndValue("用户头衔",personInfo.getTitle());
+                        personInfo.setTitleName(titleName);
+                    }
+
+
                     dataMap.put("personInfo", personInfo);
                     dataMap.put("token", token);
                     CompanyInfoDetailDTO companyInfoDetailDTO = new CompanyInfoDetailDTO();
@@ -363,6 +389,9 @@ public class PersonInfoApiController {
                     companyInfoDetailDTO.setId(companyInfo.getId());
                     companyInfoDetailDTO.setLogoUrl(companyInfo.getLogoUrl());
 
+                    String positionName = dataDictionaryService.findNameByCatalogNameAndValue("企联职务",companyInfo.getPosition());
+                    companyInfoDetailDTO.setPositionName(positionName);
+
                     dataMap.put("companyInfo", companyInfoDetailDTO);
 
                     int messageNum = messageReceiverService.countByReadStatus(personInfo.getId(), false);