自发布面试地址修改

happy-job-module-crm/src/main/java/com/jeeplus/modules/cmposition/entity/CmPositionTrack.java

@@ -42,6 +42,7 @@ public class CmPositionTrack extends DataEntity<CmPositionTrack> {
 	private String applyPositionName;//岗位名称
 	private String applyPositionId; //投递表主键id
 	private Date interviewInviteTime;//邀请时间
+	private String otherInterviewAddress; //自发布面试地址
 	
 	private CmCandidateTrack cmCandidateTrack;//关联候选人跟进实体类
 	private CrMember crMember;//关联的会员实体类
@@ -402,4 +403,12 @@ public class CmPositionTrack extends DataEntity<CmPositionTrack> {
 	public void setInterviewInviteTime(Date interviewInviteTime) {
 		this.interviewInviteTime = interviewInviteTime;
 	}
+
+	public String getOtherInterviewAddress() {
+		return otherInterviewAddress;
+	}
+
+	public void setOtherInterviewAddress(String otherInterviewAddress) {
+		this.otherInterviewAddress = otherInterviewAddress;
+	}
 }

happy-job-module-crm/src/main/java/com/jeeplus/modules/cmposition/mapper/xml/CmPositionTrackMapper.xml

@@ -30,6 +30,7 @@
 		a.interview_contact_phone as "interviewContactPhone",
 		a.apply_position_id as "applyPositionId",
 		a.interview_invite_time as "interviewInviteTime",
+		a.other_interview_address as "otherInterviewAddress",
 		c.id AS "cmCandidateTrack.id",
 		c.belong_owner AS "cmCandidateTrack.belongOwner",
 		c.contact_person AS "cmCandidateTrack.contactPerson",
@@ -183,7 +184,8 @@
 			interview_contact_person,
 			interview_contact_phone,
 			apply_position_id,
-			interview_invite_time
+			interview_invite_time,
+			other_interview_address
 		) VALUES (
 			#{memberId},
 			#{positionId},
@@ -210,7 +212,8 @@
 			#{interviewContactPerson},
 			#{interviewContactPhone},
 			#{applyPositionId},
-			#{interviewInviteTime}
+			#{interviewInviteTime},
+			#{otherInterviewAddress}
 		)
 	</insert>
 
@@ -240,7 +243,8 @@
 			<if test="interviewContactPerson != null">interview_contact_person = #{interviewContactPerson},</if>
 			<if test="interviewContactPhone != null">interview_contact_phone = #{interviewContactPhone},</if>
 			<if test="applyPositionId != null">apply_position_id = #{applyPositionId},</if>
-			<if test="interviewInviteTime != null">interview_invite_time = #{interviewInviteTime}</if>
+			<if test="interviewInviteTime != null">interview_invite_time = #{interviewInviteTime},</if>
+			<if test="other_interview_address != null">interview_invite_time = #{otherInterviewAddress}</if>
 		 </trim>
 		WHERE id = #{id}
 	</update>

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/api/hpuser/entity/CmPositionTrackAPI.java

@@ -43,6 +43,7 @@ public class CmPositionTrackAPI extends DataEntity<CmPositionTrackAPI> {
 	private Date interviewInviteTime;//邀请时间
 	private HpMember hpMember;
 	private String realName;
+	private String otherInterviewAddress; //自发布面试地址
 
 
 
@@ -268,4 +269,12 @@ public class CmPositionTrackAPI extends DataEntity<CmPositionTrackAPI> {
 	public void setRealName(String realName) {
 		this.realName = realName;
 	}
+
+	public String getOtherInterviewAddress() {
+		return otherInterviewAddress;
+	}
+
+	public void setOtherInterviewAddress(String otherInterviewAddress) {
+		this.otherInterviewAddress = otherInterviewAddress;
+	}
 }

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/dpposition/mapper/xml/DpPositionMapper.xml

@@ -441,7 +441,8 @@
 			<if test="interviewContactPerson != null">interview_contact_person = #{interviewContactPerson},</if>
 			<if test="interviewContactPhone != null">interview_contact_phone = #{interviewContactPhone},</if>
 			<if test="applyPositionId != null">apply_position_id = #{applyPositionId},</if>
-			<if test="interviewInviteTime != null">interview_invite_time = #{interviewInviteTime}</if>
+			<if test="interviewInviteTime != null">interview_invite_time = #{interviewInviteTime},</if>
+            <if test="other_interview_address != null">interview_invite_time = #{otherInterviewAddress}</if>
 		</trim>
 		WHERE id = #{id}
 	</update>

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/dpposition/service/DpPositionService.java

@@ -722,7 +722,8 @@ public class DpPositionService extends CrudService<DpPositionMapper, DpPosition>
                     CmPositionTrackAPI cmPositionTrackAPI=mapper.findCmPositionTrackAPI(applyId);
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     cmPositionTrackAPI.setInterviewTime(sdf.parse(interviewTime));
-                    cmPositionTrackAPI.setInteviewAddress(interviewAddres);
+                    cmPositionTrackAPI.setInteviewAddress("0");
+                    cmPositionTrackAPI.setOtherInterviewAddress(interviewAddres);
                     cmPositionTrackAPI.setStatus("2");
                     cmPositionTrackAPI.setInterviewContactPerson(contactPerson);
                     cmPositionTrackAPI.setInterviewContactPhone(contactPhone);

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/hpuser/mapper/xml/HpInterviewInviteMapper.xml

@@ -220,6 +220,7 @@
 		a.apply_position_name as "applyPositionName",
 		a.interview_time AS "interviewTime",
 		a.inteview_address AS "inteviewAddress",
+		a.other_interview_address as "otherInterviewAddress",
 		a.interview_contact_person as "interviewContactPerson",
 		a.interview_contact_phone as "interviewContactPhone",
 		a.interview_invite_time as "interviewInviteTime",

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/hpuser/service/HpInterviewInviteService.java

@@ -648,6 +648,12 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                 if (StringUtils.isNotBlank(interviewId)) {
                     HpInterviewInvite hpInterviewInvite = new HpInterviewInvite();
                     CmPositionTrackAPI cmPositionTrackAPI=mapper.getCmPositionTrackAPI(interviewId);
+                    String address=cmPositionTrackAPI.getInteviewAddress();
+                    if("0".equals(address)&&StringUtils.isNotBlank(cmPositionTrackAPI.getOtherInterviewAddress())){
+                        address=cmPositionTrackAPI.getOtherInterviewAddress();
+                    }else{
+                        address=DictUtils.getDictLabel(address, "cm_inteview_address", "");
+                    }
                     hpInterviewInvite.setId(cmPositionTrackAPI.getId());
                     if(StringUtils.isNotBlank(cmPositionTrackAPI.getApplyPositionId())){
                         hpInterviewInvite.setApplyPositionId(Integer.parseInt(cmPositionTrackAPI.getApplyPositionId()));
@@ -656,7 +662,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                     hpInterviewInvite.setCompanyName(cmPositionTrackAPI.getApplyCompanyName());
                     hpInterviewInvite.setInterviewTime(cmPositionTrackAPI.getInterviewTime());
                     hpInterviewInvite.setInviteTime(cmPositionTrackAPI.getInterviewInviteTime());
-                    hpInterviewInvite.setInterviewAddres(DictUtils.getDictLabel(cmPositionTrackAPI.getInteviewAddress(), "cm_inteview_address", ""));
+                    hpInterviewInvite.setInterviewAddres(address);
                     hpInterviewInvite.setContactPerson(cmPositionTrackAPI.getInterviewContactPerson());
                     hpInterviewInvite.setContactPhone(cmPositionTrackAPI.getInterviewContactPhone());
                     hpInterviewInvite.setRealName(cmPositionTrackAPI.getRealName());