shuzhan 2 лет назад
Родитель
Сommit
def50e9d5d
23 измененных файлов с 641 добавлено и 50 удалено
  1. 3 0
      common/src/main/java/com/jpsoft/employment/modules/base/dao/JobEnterpriseRelationDAO.java
  2. 2 0
      common/src/main/java/com/jpsoft/employment/modules/base/dao/JobInformationInfoDAO.java
  3. 3 0
      common/src/main/java/com/jpsoft/employment/modules/base/dao/RecruitPersonRelationDAO.java
  4. 1 0
      common/src/main/java/com/jpsoft/employment/modules/base/dao/ShareWorksInfoDAO.java
  5. 4 0
      common/src/main/java/com/jpsoft/employment/modules/base/entity/JobEnterpriseRelation.java
  6. 3 0
      common/src/main/java/com/jpsoft/employment/modules/base/entity/RecruitInformationInfo.java
  7. 7 0
      common/src/main/java/com/jpsoft/employment/modules/base/entity/RecruitPersonRelation.java
  8. 2 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/JobEnterpriseRelationService.java
  9. 1 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/JobInformationInfoService.java
  10. 3 1
      common/src/main/java/com/jpsoft/employment/modules/base/service/RecruitPersonRelationService.java
  11. 1 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/ShareWorksInfoService.java
  12. 14 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/JobEnterpriseRelationServiceImpl.java
  13. 5 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/JobInformationInfoServiceImpl.java
  14. 14 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/RecruitPersonRelationServiceImpl.java
  15. 9 0
      common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ShareWorksInfoServiceImpl.java
  16. 26 2
      common/src/main/resources/mapper/base/JobEnterpriseRelation.xml
  17. 16 0
      common/src/main/resources/mapper/base/JobInformationInfo.xml
  18. 18 3
      common/src/main/resources/mapper/base/RecruitInformationInfo.xml
  19. 41 1
      common/src/main/resources/mapper/base/RecruitPersonRelation.xml
  20. 18 2
      common/src/main/resources/mapper/base/ShareWorksInfo.xml
  21. 125 20
      web/src/main/java/com/jpsoft/employment/modules/mobile/controller/JobApiController.java
  22. 320 19
      web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java
  23. 5 2
      web/src/main/java/com/jpsoft/employment/modules/mobile/controller/UserApiController.java

+ 3 - 0
common/src/main/java/com/jpsoft/employment/modules/base/dao/JobEnterpriseRelationDAO.java

@@ -15,4 +15,7 @@ public interface JobEnterpriseRelationDAO {
 	int delete(String id);
 	List<JobEnterpriseRelation> list();
 	List<JobEnterpriseRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<JobEnterpriseRelation> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
+
+	List<JobEnterpriseRelation> findByEnterpriseId(String enterpriseId);
 }

+ 2 - 0
common/src/main/java/com/jpsoft/employment/modules/base/dao/JobInformationInfoDAO.java

@@ -16,4 +16,6 @@ public interface JobInformationInfoDAO {
 	List<JobInformationInfo> list();
 	List<JobInformationInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 	List<JobInformationInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
+
+	JobInformationInfo findByPersonId(String personId);
 }

+ 3 - 0
common/src/main/java/com/jpsoft/employment/modules/base/dao/RecruitPersonRelationDAO.java

@@ -15,5 +15,8 @@ public interface RecruitPersonRelationDAO {
 	int delete(String id);
 	List<RecruitPersonRelation> list();
 	List<RecruitPersonRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<RecruitPersonRelation> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 	RecruitPersonRelation findByRecruitIdAndPersonId(String recruitId,String personId);
+
+	List<RecruitPersonRelation> findByPersonId(String personId);
 }

+ 1 - 0
common/src/main/java/com/jpsoft/employment/modules/base/dao/ShareWorksInfoDAO.java

@@ -15,4 +15,5 @@ public interface ShareWorksInfoDAO {
 	int delete(String id);
 	List<ShareWorksInfo> list();
 	List<ShareWorksInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<ShareWorksInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 }

+ 4 - 0
common/src/main/java/com/jpsoft/employment/modules/base/entity/JobEnterpriseRelation.java

@@ -55,4 +55,8 @@ public class JobEnterpriseRelation {
 	@ApiModelProperty(value = "企业地址")
 	private String enterpriseAddress;
 
+	@Transient
+	@ApiModelProperty(value = "信息")
+	private JobInformationInfo jobInformationInfo;
+
 }

+ 3 - 0
common/src/main/java/com/jpsoft/employment/modules/base/entity/RecruitInformationInfo.java

@@ -77,6 +77,9 @@ public class RecruitInformationInfo {
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
+	@ApiModelProperty(value = "薪资形式")
+	private String salaryForm;
+
 
 
 	@Transient

+ 7 - 0
common/src/main/java/com/jpsoft/employment/modules/base/entity/RecruitPersonRelation.java

@@ -23,6 +23,9 @@ public class RecruitPersonRelation {
 	@ApiModelProperty(value = "用工人员ID")
 	private String workPersonId;
 
+	@ApiModelProperty(value = "简历ID")
+	private String jobInformationId;
+
 	@ApiModelProperty(value = "招募信息ID")
 	private String recruitInformationId;
 
@@ -65,4 +68,8 @@ public class RecruitPersonRelation {
 	@Transient
 	@ApiModelProperty(value = "年龄")
 	private Integer age;
+
+	@Transient
+	@ApiModelProperty(value = "信息")
+	private RecruitInformationInfo recruitInformationInfo;
 }

+ 2 - 0
common/src/main/java/com/jpsoft/employment/modules/base/service/JobEnterpriseRelationService.java

@@ -14,4 +14,6 @@ public interface JobEnterpriseRelationService {
 	int delete(String id);
 	List<JobEnterpriseRelation> list();
 	Page<JobEnterpriseRelation> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<JobEnterpriseRelation> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	List<JobEnterpriseRelation> findByEnterpriseId(String enterpriseId);
 }

+ 1 - 0
common/src/main/java/com/jpsoft/employment/modules/base/service/JobInformationInfoService.java

@@ -15,4 +15,5 @@ public interface JobInformationInfoService {
 	List<JobInformationInfo> list();
 	Page<JobInformationInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	Page<JobInformationInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	JobInformationInfo findByPersonId(String personId);
 }

+ 3 - 1
common/src/main/java/com/jpsoft/employment/modules/base/service/RecruitPersonRelationService.java

@@ -14,6 +14,8 @@ public interface RecruitPersonRelationService {
 	int delete(String id);
 	List<RecruitPersonRelation> list();
 	Page<RecruitPersonRelation> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-
+	Page<RecruitPersonRelation> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	RecruitPersonRelation findByRecruitIdAndPersonId(String recruitId,String personId);
+
+	List<RecruitPersonRelation> findByPersonId(String personId);
 }

+ 1 - 0
common/src/main/java/com/jpsoft/employment/modules/base/service/ShareWorksInfoService.java

@@ -14,4 +14,5 @@ public interface ShareWorksInfoService {
 	int delete(String id);
 	List<ShareWorksInfo> list();
 	Page<ShareWorksInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<ShareWorksInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

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

@@ -67,4 +67,18 @@ public class JobEnterpriseRelationServiceImpl implements JobEnterpriseRelationSe
         
         return page;
 	}
+
+	@Override
+	public Page<JobEnterpriseRelation> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<JobEnterpriseRelation> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			jobEnterpriseRelationDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
+
+	@Override
+	public List<JobEnterpriseRelation> findByEnterpriseId(String enterpriseId){
+		return jobEnterpriseRelationDAO.findByEnterpriseId(enterpriseId);
+	}
 }

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

@@ -76,4 +76,9 @@ public class JobInformationInfoServiceImpl implements JobInformationInfoService
 
 		return page;
 	}
+
+	@Override
+	public JobInformationInfo findByPersonId(String personId){
+		return jobInformationInfoDAO.findByPersonId(personId);
+	}
 }

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

@@ -68,8 +68,22 @@ public class RecruitPersonRelationServiceImpl implements RecruitPersonRelationSe
         return page;
 	}
 
+	@Override
+	public Page<RecruitPersonRelation> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<RecruitPersonRelation> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			recruitPersonRelationDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
+
 	@Override
 	public RecruitPersonRelation findByRecruitIdAndPersonId(String recruitId,String personId){
 		return recruitPersonRelationDAO.findByRecruitIdAndPersonId(recruitId,personId);
 	}
+
+	@Override
+	public List<RecruitPersonRelation> findByPersonId(String personId){
+		return recruitPersonRelationDAO.findByPersonId(personId);
+	}
 }

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

@@ -67,4 +67,13 @@ public class ShareWorksInfoServiceImpl implements ShareWorksInfoService {
         
         return page;
 	}
+
+	@Override
+	public Page<ShareWorksInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<ShareWorksInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			shareWorksInfoDAO.searchMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

+ 26 - 2
common/src/main/resources/mapper/base/JobEnterpriseRelation.xml

@@ -66,8 +66,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="JobEnterpriseRelationMap">
-		select 
-id_,job_information_id,enterprise_id,create_by,create_time,update_by,update_time,del_flag		from base_job_enterprise_relation where id_=#{0}
+		select * from base_job_enterprise_relation where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_job_enterprise_relation where id_=#{0}
@@ -90,4 +89,29 @@ id_,job_information_id,enterprise_id,create_by,create_time,update_by,update_time
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="JobEnterpriseRelationMap">
+		<![CDATA[
+			SELECT
+				a.*
+			FROM
+				base_job_enterprise_relation a
+				LEFT JOIN base_enterprise_info b ON a.enterprise_id = b.id_
+		]]>
+		<where>
+			a.del_flag = 0
+			AND b.del_flag = 0
+			<if test="searchParams.informationId != null">
+				and a.job_information_id = #{searchParams.informationId}
+			</if>
+			<if test="searchParams.enterpriseId != null">
+				and a.enterprise_id = #{searchParams.enterpriseId}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
+	<select id="findByEnterpriseId" resultMap="JobEnterpriseRelationMap">
+		select * from base_job_enterprise_relation where del_flag = 0 and enterprise_id = #{enterpriseId}
+	</select>
 </mapper>

+ 16 - 0
common/src/main/resources/mapper/base/JobInformationInfo.xml

@@ -156,9 +156,25 @@
 				and a.hope_salary <= #{searchParams.salaryEnd}
 				]]>
 			</if>
+			<if test="searchParams.ids != null">
+				<foreach item="id" collection="searchParams.ids"  open="and id_ in (" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
+
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}
 		</foreach>
 	</select>
+	<select id="findByPersonId" resultMap="JobInformationInfoMap">
+		SELECT
+			*
+		FROM
+			base_job_information_info
+		WHERE
+			del_flag = 0
+			and person_id = #{personId}
+		limit 1
+	</select>
 </mapper>

+ 18 - 3
common/src/main/resources/mapper/base/RecruitInformationInfo.xml

@@ -11,7 +11,7 @@
 			<result property="settlementMethod" column="settlement_method" />
 			<result property="industry" column="industry_" />
 			<result property="recruitingNumbers" column="recruiting_numbers" />
-			<result property="desc" column="desc" />
+			<result property="desc" column="desc_" />
 			<result property="contacts" column="contacts" />
 			<result property="contactsPhone" column="contacts_phone" />
 			<result property="workArea" column="work_area" />
@@ -23,6 +23,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="salaryForm" column="salary_form" />
 			</resultMap>
 	<insert id="insert"  parameterType="com.jpsoft.employment.modules.base.entity.RecruitInformationInfo">
 	<!--
@@ -32,7 +33,8 @@
 	-->
 	<![CDATA[
 		insert into base_recruit_information_info
-	    (id_,enterprise_id,position_name,salary_,settlement_method,industry_,recruiting_numbers,desc,contacts,contacts_phone,work_area,address_,browse_number,status_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,enterprise_id,position_name,salary_,settlement_method,industry_,recruiting_numbers,desc_,contacts,contacts_phone,
+	    work_area,address_,browse_number,status_,create_by,create_time,update_by,update_time,del_flag,salary_form)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -54,6 +56,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{salaryForm,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -82,7 +85,7 @@
 		recruiting_numbers=#{recruitingNumbers,jdbcType=VARCHAR},
 		</if>
 				<if test="desc!=null">
-		desc=#{desc,jdbcType=VARCHAR},
+					desc_=#{desc,jdbcType=VARCHAR},
 		</if>
 				<if test="contacts!=null">
 		contacts=#{contacts,jdbcType=VARCHAR},
@@ -117,6 +120,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="salaryForm!=null">
+				salary_form=#{salaryForm,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -148,6 +154,9 @@
 		]]>
 		<where>
 			a.del_flag = 0
+			<if test="searchParams.enterpriseId != null">
+				and a.enterprise_id = #{searchParams.enterpriseId}
+			</if>
 			<if test="searchParams.settlementMethod != null">
 				and a.settlement_method = #{searchParams.settlementMethod}
 			</if>
@@ -157,6 +166,12 @@
 			<if test="searchParams.content != null">
 				and (a.position_name like #{searchParams.content} or a.desc like #{searchParams.content})
 			</if>
+			<if test="searchParams.industry != null">
+				and a.industry_ = #{searchParams.industry}
+			</if>
+			<if test="searchParams.salaryForm != null">
+				and a.salary_form = #{searchParams.salaryForm}
+			</if>
 			<if test="searchParams.salaryStart != null">
 				<![CDATA[
 				and a.salary_ >= #{searchParams.salaryStart}

+ 41 - 1
common/src/main/resources/mapper/base/RecruitPersonRelation.xml

@@ -12,6 +12,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="jobInformationId" column="job_information_id" />
 			</resultMap>
 	<insert id="insert"  parameterType="com.jpsoft.employment.modules.base.entity.RecruitPersonRelation">
 	<!--
@@ -21,7 +22,7 @@
 	-->
 	<![CDATA[
 		insert into base_recruit_person_relation
-	    (id_,work_person_id,recruit_information_id,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,work_person_id,recruit_information_id,create_by,create_time,update_by,update_time,del_flag,job_information_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -32,6 +33,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{jobInformationId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -62,6 +64,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="jobInformationId!=null">
+				job_information_id=#{jobInformationId,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -106,4 +111,39 @@
 		AND recruit_information_id = #{recruitId}
 		LIMIT 1
 	</select>
+	<select id="findByPersonId" resultMap="RecruitPersonRelationMap">
+		select * from base_recruit_person_relation where del_flag = 0 and work_person_id = #{personId}
+		order by create_time desc
+	</select>
+
+	<select id="searchMobile" parameterType="hashmap" resultMap="RecruitPersonRelationMap">
+		<![CDATA[
+			SELECT
+				a.*
+			FROM
+				base_recruit_person_relation a
+				LEFT JOIN base_person_info b ON a.work_person_id = b.id_
+				left join base_recruit_information_info c on a.recruit_information_id = c.id_
+		]]>
+		<where>
+			a.del_flag = false
+			and b.del_flag = 0
+			and c.del_flag = 0
+			<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>
+			<if test="searchParams.enterpriseId != null">
+				and c.enterprise_id = #{searchParams.enterpriseId}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

+ 18 - 2
common/src/main/resources/mapper/base/ShareWorksInfo.xml

@@ -81,8 +81,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="ShareWorksInfoMap">
-		select 
-id_,type_,status_,title_,content_,author_,create_by,create_time,update_by,update_time,del_flag		from base_share_works_info where id_=#{0}
+		select * from base_share_works_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_share_works_info where id_=#{0}
@@ -107,4 +106,21 @@ id_,type_,status_,title_,content_,author_,create_by,create_time,update_by,update
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="ShareWorksInfoMap">
+		<![CDATA[
+			select a.* from base_share_works_info a
+		]]>
+		<where>
+			a.del_flag = 0
+			<if test="searchParams.createBy != null">
+				and a.cteate_by = #{searchParams.createBy}
+			</if>
+			<if test="searchParams.status != null">
+				and a.status_ = #{searchParams.status}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

+ 125 - 20
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/JobApiController.java

@@ -50,6 +50,35 @@ public class JobApiController {
     @Autowired
     private RecruitPersonRelationService recruitPersonRelationService;
 
+    @ApiOperation(value="我的求职信息")
+    @RequestMapping(value = "myJobHunt",method = RequestMethod.POST)
+    public MessageResult<Map> myJobHunt(
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Map returnMap = new HashMap();
+            JobInformationInfo jobInformationInfo = jobInformationInfoService.findByPersonId(personInfo.getId());
+
+            returnMap.put("jobInformationInfo",jobInformationInfo);
+            msgResult.setData(returnMap);
+
+            msgResult.setResult(true);
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
     @ApiOperation(value="发布求职信息")
     @RequestMapping(value = "createJobHunt",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -83,6 +112,13 @@ public class JobApiController {
                 throw new Exception("未登录");
             }
 
+            if(StringUtils.isNotEmpty(photo)) {
+                //保存头像
+                personInfo.setPhoto(photo);
+                personInfoService.update(personInfo);
+            }
+
+
             if (StringUtils.isNotEmpty(id)) {
                 JobInformationInfo jobInformationInfo = jobInformationInfoService.get(id);
                 jobInformationInfo.setUpdateBy(subject);
@@ -101,24 +137,43 @@ public class JobApiController {
 
                 jobInformationInfoService.update(jobInformationInfo);
             } else {
-                JobInformationInfo jobInformationInfo = new JobInformationInfo();
-                jobInformationInfo.setId(UUID.randomUUID().toString());
-                jobInformationInfo.setDelFlag(false);
-                jobInformationInfo.setCreateBy(subject);
-                jobInformationInfo.setCreateTime(new Date());
-                jobInformationInfo.setStatus("0");
+                JobInformationInfo jobInformationInfo = jobInformationInfoService.findByPersonId(personInfo.getId());
+                if(jobInformationInfo == null) {
+                    jobInformationInfo = new JobInformationInfo();
+                    jobInformationInfo.setId(UUID.randomUUID().toString());
+                    jobInformationInfo.setDelFlag(false);
+                    jobInformationInfo.setCreateBy(subject);
+                    jobInformationInfo.setCreateTime(new Date());
+                    jobInformationInfo.setStatus("0");
 
-                jobInformationInfo.setPersonId(subject);
-                jobInformationInfo.setIntendedIndustries(intendedIndustries);
-                jobInformationInfo.setIntendedPosition(intendedPosition);
-                jobInformationInfo.setHopeSalary(hopeSalary);
-                jobInformationInfo.setMethod(method);
-                jobInformationInfo.setWorkExperience(workExperience);
-                jobInformationInfo.setEducation(education);
-                jobInformationInfo.setServiceDesc(serviceDesc);
-                jobInformationInfo.setPhoto(photo);
+                    jobInformationInfo.setPersonId(subject);
+                    jobInformationInfo.setIntendedIndustries(intendedIndustries);
+                    jobInformationInfo.setIntendedPosition(intendedPosition);
+                    jobInformationInfo.setHopeSalary(hopeSalary);
+                    jobInformationInfo.setMethod(method);
+                    jobInformationInfo.setWorkExperience(workExperience);
+                    jobInformationInfo.setEducation(education);
+                    jobInformationInfo.setServiceDesc(serviceDesc);
+                    jobInformationInfo.setPhoto(photo);
 
-                jobInformationInfoService.insert(jobInformationInfo);
+                    jobInformationInfoService.insert(jobInformationInfo);
+                }else{
+                    jobInformationInfo.setUpdateBy(subject);
+                    jobInformationInfo.setUpdateTime(new Date());
+                    jobInformationInfo.setStatus("0");
+
+                    jobInformationInfo.setPersonId(subject);
+                    jobInformationInfo.setIntendedIndustries(intendedIndustries);
+                    jobInformationInfo.setIntendedPosition(intendedPosition);
+                    jobInformationInfo.setHopeSalary(hopeSalary);
+                    jobInformationInfo.setMethod(method);
+                    jobInformationInfo.setWorkExperience(workExperience);
+                    jobInformationInfo.setEducation(education);
+                    jobInformationInfo.setServiceDesc(serviceDesc);
+                    jobInformationInfo.setPhoto(photo);
+
+                    jobInformationInfoService.update(jobInformationInfo);
+                }
             }
 
             msgResult.setResult(true);
@@ -131,8 +186,8 @@ public class JobApiController {
         return msgResult;
     }
 
-    @ApiOperation(value="jobHuntDetail")
-    @RequestMapping(value = "求职信息详细(免登陆",method = RequestMethod.POST)
+    @ApiOperation(value="求职信息详细(免登陆")
+    @RequestMapping(value = "jobHuntDetail",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "简历ID", required = false, paramType = "form"),
     })
@@ -161,8 +216,8 @@ public class JobApiController {
     }
 
 
-    @ApiOperation(value="joinRecruit")
-    @RequestMapping(value = "我要报名(求职者报岗位",method = RequestMethod.POST)
+    @ApiOperation(value="我要报名(求职者报岗位")
+    @RequestMapping(value = "joinRecruit",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "recruitId", value = "岗位ID", required = false, paramType = "form"),
     })
@@ -208,4 +263,54 @@ public class JobApiController {
     }
 
 
+    @ApiOperation(value="我的报名")
+    @RequestMapping(value = "myRegistration",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "我的报名0,收到的邀请1,默认0", required = false, paramType = "form"),
+    })
+    public MessageResult<Map> myRegistration(
+            @RequestParam(value="type",defaultValue="0") String type,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            if("0".equals(type)){
+                Page<RecruitPersonRelation> page = recruitPersonRelationService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+
+                msgResult.setResult(true);
+                msgResult.setData(PojoUtils.pageWrapper(page));
+
+            }else if("1".equals(type)){
+                Page<JobInformationInfo> page = jobInformationInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+                for (JobInformationInfo jobInformationInfo:page) {
+                    String methodN = dataDictionaryService.findNameByCatalogNameAndValue("结算方式",jobInformationInfo.getMethod());
+                    if(StringUtils.isNotEmpty(methodN)){
+                        jobInformationInfo.setMethodN(methodN);
+                    }
+                }
+                msgResult.setResult(true);
+                msgResult.setData(PojoUtils.pageWrapper(page));
+            }
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
 }

+ 320 - 19
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java

@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RestController
@@ -53,6 +54,8 @@ public class RecruitApiController {
     @Autowired
     private JobInformationInfoService jobInformationInfoService;
     @Autowired
+    private JobEnterpriseRelationService jobEnterpriseRelationService;
+    @Autowired
     private EnterpriseInfoService enterpriseInfoService;
     @Autowired
     private ShareWorksInfoService shareWorksInfoService;
@@ -103,17 +106,23 @@ public class RecruitApiController {
     @PostMapping("findRecruitSearch")
     @ApiOperation(value = " 首搜索页面查询(公开接口)")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "(日结1,周结2,月结3 不传默认最新)", required = false, paramType = "form"),
             @ApiImplicitParam(name = "status", value = "查询是找工作0找零工1,不传默认找工作0)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "statusType", value = "找工作(日结1,周结2,月结3 不传默认最新)/找零工(最新1,最热2,不传默认最新)", required = false, paramType = "form"),
             @ApiImplicitParam(name = "content", value = "搜索内容", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "salaryStart", value = "薪资待遇起", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "salaryEnd", value = "薪资待遇止", required = false, paramType = "form"),
-            @ApiImplicitParam(name = "workExp", value = "工作经验(字典表 1无,2半年,3一年,4两年,5三年,6五年,7十年及以上)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "industry", value = "行业(找工作)字典表", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "settlementMethod", value = "结算方式(找工作)字典表", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryForm", value = "薪资形式(找工作)字典表", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryStart", value = "薪资待遇起(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryEnd", value = "薪资待遇止(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "workExp", value = "工作经验(字典表 1无,2半年,3一年,4两年,5三年,6五年,7十年及以上)(找零工)", required = false, paramType = "form"),
     })
     public MessageResult<Map> findRecruitSearch(
-            @RequestParam(value="type",defaultValue="") String type,
             @RequestParam(value="status",defaultValue="0") String status,
+            @RequestParam(value="statusType",defaultValue="") String statusType,
             @RequestParam(value="content",defaultValue="") String content,
+            @RequestParam(value="industry",defaultValue="") String industry,
+            @RequestParam(value="settlementMethod",defaultValue="") String settlementMethod,
+            @RequestParam(value="salaryForm",defaultValue="") String salaryForm,
             @RequestParam(value="salaryStart",defaultValue="") String salaryStart,
             @RequestParam(value="salaryEnd",defaultValue="") String salaryEnd,
             @RequestParam(value="workExp",defaultValue="") String workExp,
@@ -134,17 +143,19 @@ public class RecruitApiController {
                     searchParams.put("content","%" + content.trim() + "%");
                 }
 
-                if (StringUtils.isNotEmpty(type)) {
-                    searchParams.put("settlementMethod",type);
+                if (StringUtils.isNotEmpty(statusType)) {
+                    searchParams.put("settlementMethod",statusType);
                 }
 
-                if (StringUtils.isNotEmpty(salaryStart)) {
-                    searchParams.put("salaryStart",salaryStart);
+                if (StringUtils.isNotEmpty(industry)) {
+                    searchParams.put("industry",industry);
                 }
-                if (StringUtils.isNotEmpty(salaryEnd)) {
-                    searchParams.put("salaryEnd",salaryEnd);
+                if (StringUtils.isNotEmpty(settlementMethod)) {
+                    searchParams.put("settlementMethod",settlementMethod);
+                }
+                if (StringUtils.isNotEmpty(salaryForm)) {
+                    searchParams.put("salaryForm",salaryForm);
                 }
-
 
                 Page<RecruitInformationInfo> page = recruitInformationInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
                 for(RecruitInformationInfo recruitInformationInfo : page.getResult()){
@@ -157,8 +168,8 @@ public class RecruitApiController {
                 if (StringUtils.isNotEmpty(content)) {
                     searchParams.put("content","%" + content.trim() + "%");
                 }
-                if (StringUtils.isNotEmpty(type)) {
-                    searchParams.put("method",type);
+                if (StringUtils.isNotEmpty(statusType)) {
+                    searchParams.put("method",statusType);
                 }
 
                 if (StringUtils.isNotEmpty(salaryStart)) {
@@ -215,12 +226,18 @@ public class RecruitApiController {
     }
 
     @PostMapping("findJobList")
-    @ApiOperation(value = " 工驿站(公开接口)")
+    @ApiOperation(value = " 弃用-零工驿站(公开接口)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "(日结1,周结2,月结3 不传默认最新)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryStart", value = "薪资待遇起(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryEnd", value = "薪资待遇止(找零工)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "workExp", value = "工作经验(字典表 1无,2半年,3一年,4两年,5三年,6五年,7十年及以上)(找零工)", required = false, paramType = "form"),
     })
     public MessageResult<Map> findJobList(
             @RequestParam(value="type",defaultValue="") String type,
+            @RequestParam(value="salaryStart",defaultValue="") String salaryStart,
+            @RequestParam(value="salaryEnd",defaultValue="") String salaryEnd,
+            @RequestParam(value="workExp",defaultValue="") String workExp,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         MessageResult<Map> messageResult = new MessageResult<>();
@@ -236,6 +253,17 @@ public class RecruitApiController {
                 searchParams.put("settlementMethod",type);
             }
 
+            if (StringUtils.isNotEmpty(salaryStart)) {
+                searchParams.put("salaryStart",salaryStart);
+            }
+            if (StringUtils.isNotEmpty(salaryEnd)) {
+                searchParams.put("salaryEnd",salaryEnd);
+            }
+
+            if (StringUtils.isNotEmpty(workExp)) {
+                searchParams.put("workExp",workExp);
+            }
+
             Page<RecruitInformationInfo> page = recruitInformationInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
             for(RecruitInformationInfo recruitInformationInfo : page.getResult()){
                 recruitInformationInfo.setSettlementMethodN(dataDictionaryService.findNameByCatalogNameAndValue("结算方式",recruitInformationInfo.getSettlementMethod()));
@@ -253,8 +281,8 @@ public class RecruitApiController {
         return messageResult;
     }
 
-    @ApiOperation(value="createRecruit")
-    @RequestMapping(value = "发布招聘信息",method = RequestMethod.POST)
+    @ApiOperation(value="发布招聘信息")
+    @RequestMapping(value = "createRecruit",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID(传为修改", required = false, paramType = "form"),
             @ApiImplicitParam(name = "positionName", value = "职位名称", required = false, paramType = "form"),
@@ -267,6 +295,7 @@ public class RecruitApiController {
             @ApiImplicitParam(name = "contactsPhone", value = "联系电话", required = false, paramType = "form"),
             @ApiImplicitParam(name = "workArea", value = "工作地区", required = false, paramType = "form"),
             @ApiImplicitParam(name = "address", value = "详细地址", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "salaryForm", value = "薪资形式(字典:计件,计时,定额)", required = false, paramType = "form"),
     })
     public MessageResult<Map> createRecruit(
             @RequestParam(value="id",defaultValue="") String id,
@@ -280,6 +309,7 @@ public class RecruitApiController {
             @RequestParam(value="contactsPhone",defaultValue="") String contactsPhone,
             @RequestParam(value="workArea",defaultValue="") String workArea,
             @RequestParam(value="address",defaultValue="") String address,
+            @RequestParam(value="salaryForm",defaultValue="") String salaryForm,
             @RequestAttribute String subject){
 
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -311,6 +341,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setContactsPhone(contactsPhone);
                 recruitInformationInfo.setWorkArea(workArea);
                 recruitInformationInfo.setAddress(address);
+                recruitInformationInfo.setSalaryForm(salaryForm);
 
                 recruitInformationInfoService.update(recruitInformationInfo);
             } else {
@@ -332,6 +363,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setContactsPhone(contactsPhone);
                 recruitInformationInfo.setWorkArea(workArea);
                 recruitInformationInfo.setAddress(address);
+                recruitInformationInfo.setSalaryForm(salaryForm);
 
                 recruitInformationInfoService.insert(recruitInformationInfo);
             }
@@ -346,8 +378,8 @@ public class RecruitApiController {
         return msgResult;
     }
 
-    @ApiOperation(value="recruitDetail")
-    @RequestMapping(value = "招聘信息详细(免登陆",method = RequestMethod.POST)
+    @ApiOperation(value="招聘信息详细(免登陆")
+    @RequestMapping(value = "recruitDetail",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "recruitId", value = "招聘信息ID", required = false, paramType = "form"),
     })
@@ -389,6 +421,8 @@ public class RecruitApiController {
             returnMap.put("recruitInformationInfo",recruitInformationInfo);
             returnMap.put("enterpriseInfo",enterpriseInfo);
             returnMap.put("isJoin",isJoin);
+
+            msgResult.setData(returnMap);
             msgResult.setResult(true);
         }catch (Exception e){
             msgResult.setResult(false);
@@ -463,4 +497,271 @@ public class RecruitApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="我的用工管理")
+    @RequestMapping(value = "myEmployment",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "status", value = "发布中1,待审核0,未通过2", required = false, paramType = "form"),
+    })
+    public MessageResult<Map> myEmployment(
+            @RequestParam(value="status",defaultValue="1") String status,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("enterpriseId",personInfo.getEnterpriseId());
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
+
+            Page<RecruitInformationInfo> page = recruitInformationInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="我的用工管理刷新")
+    @RequestMapping(value = "myEmploymentRefresh",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = false, paramType = "form"),
+    })
+    public MessageResult<Boolean> myEmploymentRefresh(
+            @RequestParam(value="id",defaultValue="1") String id,
+            @RequestAttribute String subject){
+
+        MessageResult<Boolean> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
+            recruitInformationInfo.setUpdateBy(subject);
+            recruitInformationInfo.setUpdateTime(new Date());
+            int count = recruitInformationInfoService.update(recruitInformationInfo);
+            Boolean returnFlag = false;
+            if(count > 0){
+                returnFlag = true;
+            }
+
+            msgResult.setResult(true);
+            msgResult.setData(returnFlag);
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="我的用工管理删除")
+    @RequestMapping(value = "myEmploymentDelete",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = false, paramType = "form"),
+    })
+    public MessageResult<Boolean> myEmploymentDelete(
+            @RequestParam(value="id",defaultValue="1") String id,
+            @RequestAttribute String subject){
+
+        MessageResult<Boolean> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Boolean returnFlag = false;
+            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
+            if(recruitInformationInfo != null) {
+                recruitInformationInfo.setDelFlag(true);
+                recruitInformationInfo.setUpdateBy(subject);
+                recruitInformationInfo.setUpdateTime(new Date());
+                int count = recruitInformationInfoService.update(recruitInformationInfo);
+                if (count > 0) {
+                    returnFlag = true;
+                }
+            }
+
+            msgResult.setResult(true);
+            msgResult.setData(returnFlag);
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="我的收到报名")
+    @RequestMapping(value = "myReceivedRegistration",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "status", value = "收到报名0,邀请记录1", required = false, paramType = "form"),
+    })
+    public MessageResult<Map> myReceivedRegistration(
+            @RequestParam(value="status",defaultValue="0") String status,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
+            if("0".equals(status)){
+                searchParams.put("enterpriseId",personInfo.getEnterpriseId());
+
+                Page<RecruitPersonRelation> page = recruitPersonRelationService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+                for(RecruitPersonRelation recruitPersonRelation : page.getResult()){
+                    RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(recruitPersonRelation.getRecruitInformationId());
+
+                    EnterpriseInfo enterpriseInfo = enterpriseInfoService.get(recruitInformationInfo.getEnterpriseId());
+                    if(enterpriseInfo!=null){
+                        recruitInformationInfo.setEnterpriseName(enterpriseInfo.getName());
+                    }
+
+                    recruitInformationInfo.setIndustryN(dataDictionaryService.findNameByCatalogNameAndValue("意向行业",recruitInformationInfo.getIndustry()));
+                    recruitInformationInfo.setSettlementMethodN(dataDictionaryService.findNameByCatalogNameAndValue("结算方式",recruitInformationInfo.getSettlementMethod()));
+
+                    recruitPersonRelation.setRecruitInformationInfo(recruitInformationInfo);
+                }
+                msgResult.setResult(true);
+                msgResult.setData(PojoUtils.pageWrapper(page));
+
+            }else if("1".equals(status)){
+                searchParams.put("enterpriseId",personInfo.getEnterpriseId());
+
+                Page<JobEnterpriseRelation> page = jobEnterpriseRelationService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+                for(JobEnterpriseRelation jobEnterpriseRelation : page.getResult()){
+                    JobInformationInfo jobInformationInfo = jobInformationInfoService.get(jobEnterpriseRelation.getJobInformationId());
+                    jobInformationInfo.setMethodN(dataDictionaryService.findNameByCatalogNameAndValue("结算方式",jobInformationInfo.getMethod()));
+                    jobEnterpriseRelation.setJobInformationInfo(jobInformationInfo);
+                }
+                msgResult.setResult(true);
+                msgResult.setData(PojoUtils.pageWrapper(page));
+            }
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="我的共享用工")
+    @RequestMapping(value = "myShareWork",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "status", value = "发布中1,待审核0,未通过2", required = false, paramType = "form"),
+    })
+    public MessageResult<Map> myShareWork(
+            @RequestParam(value="status",defaultValue="1") String status,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            Map<String,Object> searchParams = new HashMap<>();
+
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time","desc"));
+
+            searchParams.put("createBy",subject);
+            searchParams.put("status",status);
+
+            Page<ShareWorksInfo> page = shareWorksInfoService.pageSearchMobile(searchParams, pageIndex, pageSize, true, sortList);
+
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="我的共享用工删除")
+    @RequestMapping(value = "myShareWorkDelete",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = false, paramType = "form"),
+    })
+    public MessageResult<Boolean> myShareWorkDelete(
+            @RequestParam(value="id",defaultValue="") String id,
+            @RequestAttribute String subject){
+
+        MessageResult<Boolean> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+            Boolean returnFlag = false;
+            ShareWorksInfo shareWorksInfo = shareWorksInfoService.get(id);
+            if(shareWorksInfo != null){
+                shareWorksInfo.setDelFlag(true);
+                shareWorksInfo.setUpdateBy(subject);
+                shareWorksInfo.setUpdateTime(new Date());
+                int count = shareWorksInfoService.update(shareWorksInfo);
+                if(count > 0 ){
+                    returnFlag = true;
+                }
+            }
+
+            msgResult.setResult(true);
+            msgResult.setData(returnFlag);
+
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
 }

+ 5 - 2
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/UserApiController.java

@@ -59,8 +59,11 @@ public class UserApiController {
             if (regUser != null) {
                 String token = JwtUtil.createToken(jwtSecret, regUser.getId(), DateTime.now().plusDays(7).toDate());
 
+                EnterpriseInfo enterpriseInfo = enterpriseInfoService.get(regUser.getEnterpriseId());
+
                 Map<String, Object> dataMap = new HashMap<String, Object>();
                 dataMap.put("regUser", regUser);
+                dataMap.put("enterpriseInfo", enterpriseInfo);
                 dataMap.put("token", token);
 
                 msgResult.setData(dataMap);
@@ -342,8 +345,8 @@ public class UserApiController {
     }
 
 
-    @ApiOperation(value="createAuthentication")
-    @RequestMapping(value = "绑定认证信息",method = RequestMethod.POST)
+    @ApiOperation(value="绑定认证信息")
+    @RequestMapping(value = "createAuthentication",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "realName", value = "真实姓名", required = false, paramType = "form"),
             @ApiImplicitParam(name = "idCard", value = "身份证", required = false, paramType = "form"),