Merge remote-tracking branch 'origin/master'

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

@@ -318,8 +318,7 @@
 
 	<select id="getCmWelfarePosition" resultType="CmWelfarePosition" >
 		SELECT
-		a.position_name AS "positionName",
-		a.company_id as "cmCompany.id"
+		a.position_name AS "positionName"
 		FROM hp_welfare_position a
 		WHERE a.id = #{0}
 	</select>

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

@@ -157,6 +157,8 @@
 		FROM (
 		(SELECT a.id AS "id",
 		a.invite_time AS "inviteTime",
+		a.position_name as "positionName",
+		a.company_name as "companyName",
 		p.position_id AS "positionId",
 		p.position_category AS "positionCategory"
 		from hp_interview_invite a

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

@@ -114,6 +114,10 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                             HpPositionAddress hpPositionAddress = new HpPositionAddress();
                             List<HpPositionAddress> hpPositionAddressList = Lists.newArrayList();
                             Map<String, Object> map = new HashMap<>();
+                            String companyName=hpInterviewInvite1.getCompanyName();
+                            String positionName=hpInterviewInvite1.getPositionName();
+                            HpCompany hpCompany1=new HpCompany();
+                            hpCompany1.setCompanyName(companyName);
                             if (positionCategory != null) {
                                 switch (positionCategory) {
                                     case 0:
@@ -123,7 +127,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         HpFulltimePositionAPI hpFulltimePositionAPI = new HpFulltimePositionAPI();
                                         hpFulltimePositionAPI.setId(hpFulltimePositionAPI1.getId());
                                         hpFulltimePositionAPI.setUpdateDate(hpFulltimePositionAPI1.getUpdateDate());
-                                        hpFulltimePositionAPI.setHpCompany(hpFulltimePositionAPI1.getHpCompany());
+                                        hpFulltimePositionAPI.setHpCompany(hpCompany1);
                                         hpFulltimePositionAPI.setPositionType(String.valueOf(hpFulltimePositionAPI1.getPositionType()));
                                         hpFulltimePositionAPI.setRecruitNumber(hpFulltimePositionAPI1.getRecruitNumber());
                                         hpFulltimePositionAPI.setBasicSalary(String.valueOf(hpFulltimePositionAPI1.getBasicSalary()));
@@ -155,7 +159,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpFulltimePositionAPI.setIsPublish(hpFulltimePositionAPI1.getIsPublish());
                                         hpFulltimePositionAPI.setReward(hpFulltimePositionAPI1.getReward());
                                         hpFulltimePositionAPI.setPositionCategory(hpFulltimePositionAPI1.getPositionCategory());
-                                        hpFulltimePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpFulltimePositionAPI1.getPositionName()));
+                                        hpFulltimePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
                                         hpPositionAddress.setPositionId(Integer.parseInt(hpFulltimePositionAPI1.getId()));
                                         hpPositionAddress.setPositionCategory(hpFulltimePositionAPI1.getPositionCategory());
@@ -174,7 +178,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         HpParttimePositionAPI hpParttimePositionAPI = new HpParttimePositionAPI();
                                         hpParttimePositionAPI.setId(hpParttimePositionAPI1.getId());
                                         hpParttimePositionAPI.setUpdateDate(hpParttimePositionAPI1.getUpdateDate());
-                                        hpParttimePositionAPI.setHpCompany(hpParttimePositionAPI1.getHpCompany());
+                                        hpParttimePositionAPI.setHpCompany(hpCompany1);
                                         hpParttimePositionAPI.setPositionType(String.valueOf(hpParttimePositionAPI1.getPositionType()));
                                         hpParttimePositionAPI.setRecruitNumber(String.valueOf(hpParttimePositionAPI1.getRecruitNumber()));
                                         hpParttimePositionAPI.setSettlementMethod(String.valueOf(hpParttimePositionAPI1.getSettlementMethod()));
@@ -200,7 +204,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpParttimePositionAPI.setIsPublish(hpParttimePositionAPI1.getIsPublish());
                                         hpParttimePositionAPI.setReward(hpParttimePositionAPI1.getReward());
                                         hpParttimePositionAPI.setPositionCategory(hpParttimePositionAPI1.getPositionCategory());
-                                        hpParttimePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpParttimePositionAPI1.getPositionName()));
+                                        hpParttimePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
                                         hpPositionAddress.setPositionId(Integer.parseInt(hpParttimePositionAPI1.getId()));
                                         hpPositionAddress.setPositionCategory(hpParttimePositionAPI1.getPositionCategory());
@@ -217,7 +221,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         HpRewardPositionAPI hpRewardPositionAPI = new HpRewardPositionAPI();
                                         hpRewardPositionAPI.setId(hpRewardPositionAPI1.getId());
                                         hpRewardPositionAPI.setUpdateDate(hpRewardPositionAPI1.getUpdateDate());
-                                        hpRewardPositionAPI.setHpCompany(hpRewardPositionAPI1.getHpCompany());
+                                        hpRewardPositionAPI.setHpCompany(hpCompany1);
                                         hpRewardPositionAPI.setPositionType(String.valueOf(hpRewardPositionAPI1.getPositionType()));
                                         hpRewardPositionAPI.setPositionFeature(String.valueOf(hpRewardPositionAPI1.getPositionFeature()));
                                         hpRewardPositionAPI.setRecruitNumber(String.valueOf(hpRewardPositionAPI1.getRecruitNumber()));
@@ -253,7 +257,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpRewardPositionAPI.setIsPublish(hpRewardPositionAPI1.getIsPublish());
                                         hpRewardPositionAPI.setReward(hpRewardPositionAPI1.getReward());
                                         hpRewardPositionAPI.setPositionCategory(hpRewardPositionAPI1.getPositionCategory());
-                                        hpRewardPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpRewardPositionAPI1.getPositionName()));
+                                        hpRewardPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
 
                                         hpPositionAddress.setPositionId(Integer.parseInt(hpRewardPositionAPI1.getId()));
@@ -271,7 +275,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         HpGoodmoneyPositionAPI hpGoodmoneyPositionAPI = new HpGoodmoneyPositionAPI();
                                         hpGoodmoneyPositionAPI.setId(hpGoodmoneyPositionAPI1.getId());
                                         hpGoodmoneyPositionAPI.setUpdateDate(hpGoodmoneyPositionAPI1.getUpdateDate());
-                                        hpGoodmoneyPositionAPI.setHpCompany(hpGoodmoneyPositionAPI1.getHpCompany());
+                                        hpGoodmoneyPositionAPI.setHpCompany(hpCompany1);
                                         hpGoodmoneyPositionAPI.setPositionType(String.valueOf(hpGoodmoneyPositionAPI1.getPositionType()));
                                         hpGoodmoneyPositionAPI.setPositionFeature(String.valueOf(hpGoodmoneyPositionAPI1.getPositionFeature()));
                                         hpGoodmoneyPositionAPI.setRecruitNumber(String.valueOf(hpGoodmoneyPositionAPI1.getRecruitNumber()));
@@ -309,7 +313,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpGoodmoneyPositionAPI.setIsPublish(hpGoodmoneyPositionAPI1.getIsPublish());
                                         hpGoodmoneyPositionAPI.setReward(hpGoodmoneyPositionAPI1.getReward());
                                         hpGoodmoneyPositionAPI.setPositionCategory(hpGoodmoneyPositionAPI1.getPositionCategory());
-                                        hpGoodmoneyPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpGoodmoneyPositionAPI1.getPositionName()));
+                                        hpGoodmoneyPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
 
                                         hpPositionAddress.setPositionId(Integer.parseInt(hpGoodmoneyPositionAPI1.getId()));
@@ -328,7 +332,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpGroupPositionAPI.setId(hpGroupPositionAPI1.getId());
                                         hpGroupPositionAPI.setGroupEndTime(hpGroupPositionAPI1.getGroupEndTime());
                                         hpGroupPositionAPI.setUpdateDate(hpGroupPositionAPI1.getUpdateDate());
-                                        hpGroupPositionAPI.setHpCompany(hpGroupPositionAPI1.getHpCompany());
+                                        hpGroupPositionAPI.setHpCompany(hpCompany1);
                                         hpGroupPositionAPI.setPositionType(String.valueOf(hpGroupPositionAPI1.getPositionType()));
                                         hpGroupPositionAPI.setPositionFeature(hpGroupPositionAPI.getPositionName());
                                         hpGroupPositionAPI.setRecruitNumber(String.valueOf(hpGroupPositionAPI1.getRecruitNumber()));
@@ -368,7 +372,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpGroupPositionAPI.setIsPublish(hpGroupPositionAPI1.getIsPublish());
                                         hpGroupPositionAPI.setReward(hpGroupPositionAPI1.getReward());
                                         hpGroupPositionAPI.setPositionCategory(hpGroupPositionAPI1.getPositionCategory());
-                                        hpGroupPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpGroupPositionAPI1.getPositionName()));
+                                        hpGroupPositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
                                         hpPositionAddress.setPositionId(Integer.parseInt(hpGroupPositionAPI1.getId()));
                                         hpPositionAddress.setPositionCategory(hpGroupPositionAPI1.getPositionCategory());
@@ -398,7 +402,7 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         hpWelfarePositionAPI.setPublishTime(hpWelfarePositionAPI1.getPublishTime());
                                         hpWelfarePositionAPI.setEndTime(hpWelfarePositionAPI1.getEndTime());
                                         hpWelfarePositionAPI.setPositionCategory(hpWelfarePositionAPI1.getPositionCategory());
-                                        hpWelfarePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(hpWelfarePositionAPI1.getPositionName()));
+                                        hpWelfarePositionAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
 
 
                                         hpWelfarePositionAPI.setCreateDate(hpInterviewInvite1.getInviteTime());
@@ -470,15 +474,15 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         }
                                         dpPositionForApplyAPI.setWelfare(welfare);
                                         dpPositionForApplyAPI.setSpecialWelfare(welfare);
-                                        HpCompany hpCompany = new HpCompany();
-                                        if (dpPositionForApplyAPI1.getDpEnterpriseAuthentication() != null) {
-                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName())) {
-                                                hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
-                                            }
-                                        }
-                                        dpPositionForApplyAPI.setHpCompany(hpCompany);
-
-                                        dpPositionForApplyAPI.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getPositionName()));
+//                                        HpCompany hpCompany = new HpCompany();
+//                                        if (dpPositionForApplyAPI1.getDpEnterpriseAuthentication() != null) {
+//                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName())) {
+//                                                hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+//                                            }
+//                                        }
+                                        dpPositionForApplyAPI.setHpCompany(hpCompany1);
+
+                                        dpPositionForApplyAPI.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
                                         hpPositionAddress.setPositionId(Integer.parseInt(dpPositionForApplyAPI1.getId()));
                                         hpPositionAddress.setPositionCategory(dpPositionForApplyAPI1.getPositionCategory());
                                         hpPositionAddressList = hpPositionAddressService.findAPIList(hpPositionAddress);
@@ -557,15 +561,15 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         }
                                         dpPositionForApplyAPI3.setSpecialWelfare(welfare1);
                                         dpPositionForApplyAPI3.setWelfare(welfare1);
-                                        HpCompany hpCompany1 = new HpCompany();
-                                        if (dpPositionForApplyAPI2.getDpEnterpriseAuthentication() != null) {
-                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName())) {
-                                                hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
-                                            }
-                                        }
+//                                        HpCompany hpCompany2 = new HpCompany();
+//                                        if (dpPositionForApplyAPI2.getDpEnterpriseAuthentication() != null) {
+//                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName())) {
+//                                                hpCompany2.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
+//                                            }
+//                                        }
                                         dpPositionForApplyAPI3.setHpCompany(hpCompany1);
 
-                                        dpPositionForApplyAPI3.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getPositionName()));
+                                        dpPositionForApplyAPI3.setPositionName(StringEscapeUtils.unescapeHtml4(positionName));
                                         hpPositionAddress.setPositionId(Integer.parseInt(dpPositionForApplyAPI2.getId()));
                                         hpPositionAddress.setPositionCategory(dpPositionForApplyAPI2.getPositionCategory());
                                         hpPositionAddressList = hpPositionAddressService.findAPIList(hpPositionAddress);