Browse Source

代码同步

shuzhan 1 year ago
parent
commit
e697e21551

+ 1 - 1
common/src/main/java/com/jpsoft/employment/modules/base/entity/JobInformationInfo.java

@@ -137,7 +137,7 @@ public class JobInformationInfo {
 
 	@Transient
 	@ApiModelProperty(value = "是否匿名")
-	private Boolean isAnonymous = false;
+	private Boolean isAnonymous = true;
 
 	@Transient
 	@ApiModelProperty(value = "简历状态(1公开0隐藏")

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

@@ -107,4 +107,7 @@ public class RecruitInformationInfo {
 	@Transient
 	@ApiModelProperty(value = "未读数量")
 	private Integer isReadNumber;
+
+	@ApiModelProperty(value = "是否置顶")
+	private Boolean isTop;
 }

+ 8 - 1
common/src/main/resources/mapper/base/RecruitInformationInfo.xml

@@ -26,6 +26,7 @@
 			<result property="salaryForm" column="salary_form" />
 			<result property="isOnline" column="is_online" />
 			<result property="ageRequirement" column="age_requirement" />
+			<result property="isTop" column="is_top" />
 			</resultMap>
 	<insert id="insert"  parameterType="com.jpsoft.employment.modules.base.entity.RecruitInformationInfo">
 	<!--
@@ -36,7 +37,9 @@
 	<![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,salary_form,is_online,age_requirement)
+	    work_area,address_,browse_number,status_,create_by,create_time,
+	    update_by,update_time,del_flag,salary_form,is_online,age_requirement,
+	    is_top)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -61,6 +64,7 @@
 ,#{salaryForm,jdbcType=VARCHAR}
 ,#{isOnline,jdbcType= NUMERIC }
 ,#{ageRequirement,jdbcType=VARCHAR}
+,#{isTop,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -133,6 +137,9 @@
 			<if test="ageRequirement!=null">
 				age_requirement=#{ageRequirement,jdbcType= VARCHAR },
 			</if>
+			<if test="isTop!=null">
+				is_top=#{isTop,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

+ 3 - 0
web/src/main/java/com/jpsoft/employment/modules/base/controller/PersonInfoController.java

@@ -380,6 +380,9 @@ public class PersonInfoController {
                     personInfo.setCreateBy(subject);
                     personInfo.setCreateTime(new Date());
                     personInfo.setDelFlag(false);
+                    personInfo.setIsAnonymous(true);
+                    personInfo.setIntention("1");//求职中
+                    personInfo.setJobStatus("1");//显示简历
 
 
                     //是否填写关联企业

+ 1 - 0
web/src/main/java/com/jpsoft/employment/modules/base/controller/RecruitInformationInfoController.java

@@ -631,6 +631,7 @@ public class RecruitInformationInfoController {
                     recruitInformationInfo.setWorkArea(workArea);
                     recruitInformationInfo.setAddress(address);
                     recruitInformationInfo.setIsOnline(true);
+                    recruitInformationInfo.setIsTop(false);
 
 
                     //保存新企业

+ 3 - 1
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java

@@ -147,6 +147,7 @@ public class RecruitApiController {
             }
 
             if("0".equals(status)){
+                sortList.add(new Sort("a.is_top","asc"));
                 sortList.add(new Sort("a.update_time","desc"));
                 if (StringUtils.isNotEmpty(content)) {
                     searchParams.put("content","%" + content.trim() + "%");
@@ -185,6 +186,7 @@ public class RecruitApiController {
                     searchParams.put("method",settlementMethod);
                 }
 
+                sortList.add(new Sort("a.sort_no","asc"));
 
                 if ("2".equals(statusType)) {
                     sortList.add(new Sort("a.browse_number","asc"));
@@ -193,7 +195,6 @@ public class RecruitApiController {
                     sortList.add(new Sort("a.update_time","desc"));
                 }
 
-                searchParams.put("status","1");
                 //searchParams.put("notIntention","2");
                 searchParams.put("intention","1");//只显示公开的
                 searchParams.put("jobStatus","1");//只显示公开的
@@ -374,6 +375,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setSalaryForm(salaryForm);
                 recruitInformationInfo.setIsOnline(isOnline);
                 recruitInformationInfo.setAgeRequirement(ageRequirement);
+                recruitInformationInfo.setIsTop(false);
 
                 recruitInformationInfoService.insert(recruitInformationInfo);
             }

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

@@ -331,7 +331,7 @@ public class UserApiController {
                     DES3 des3 = new DES3();
                     personInfo.setPassword(des3.encrypt(jwtSecret,"123456"));
                     personInfo.setStatus("0");
-                    personInfo.setIsAnonymous(false);
+                    personInfo.setIsAnonymous(true);
                     personInfo.setIntention("1");//求职中
                     personInfo.setJobStatus("1");//显示简历