优化问题修改

vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeInitScreQuestionsReplyRecordInfo.java

@@ -40,6 +40,9 @@ public class HotakeInitScreQuestionsReplyRecordInfo extends BaseEntity
     @Excel(name = "问题ID")
     private Long questionId;
 
+    @ApiModelProperty("问题文本")
+    private String questionText;
+
     /** 答案 */
     @ApiModelProperty("答案")
     @Excel(name = "答案")

vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeRolesApplyInfo.java

@@ -157,4 +157,7 @@ public class HotakeRolesApplyInfo extends BaseEntity
     @ApiModelProperty("岗位申请ID数据集合")
     private List<Long> applyRoleIdList;
 
+    @ApiModelProperty("初步筛选问题回答数据集合")
+    private List<HotakeInitScreQuestionsReplyRecordInfo> screQuestionsReplyRecordInfoList;
+
 }

vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeInitScreQuestionsReplyRecordInfoServiceImpl.java

@@ -171,6 +171,7 @@ public class HotakeInitScreQuestionsReplyRecordInfoServiceImpl extends BaseServi
      */
     @Override
     public int saveHotakeInitScreQuestionsReplyRecordInfo(HotakeInitScreQuestionsReplyRecordInfoVo initScreQuestionsReplyRecordInfoVo) {
+        log.info("===:{}",JSONUtil.toJsonStr(initScreQuestionsReplyRecordInfoVo));
         //先删除对应问题答案记录数据
         hotakeInitScreQuestionsReplyRecordInfoMapper.deleteHotakeInitScreQuestionsReplyRecordInfoByRoleApplyId(initScreQuestionsReplyRecordInfoVo.getRoleApplyId());
         //批量保存数据

vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesApplyInfoServiceImpl.java

@@ -10,15 +10,15 @@ import com.vetti.common.enums.FillTypeEnum;
 import com.vetti.common.enums.StageEnum;
 import com.vetti.common.exception.ServiceException;
 import com.vetti.common.utils.SecurityUtils;
-import com.vetti.hotake.domain.HotakeRolesApplyInfo;
+import com.vetti.hotake.domain.*;
-import com.vetti.hotake.domain.HotakeRolesApplyOperRecord;
-import com.vetti.hotake.domain.HotakeRolesInfo;
 import com.vetti.hotake.domain.dto.HotakeAiCvScoringRankingDto;
 import com.vetti.hotake.domain.dto.HotakeCandidateCompatibilityDto;
 import com.vetti.hotake.domain.dto.HotakeCvInfoDto;
 import com.vetti.hotake.domain.dto.HotakeRolesApplyStageStatisticalDto;
 import com.vetti.hotake.domain.dto.VcDto.*;
 import com.vetti.hotake.domain.vo.HotakeRolesApplyStageVo;
+import com.vetti.hotake.mapper.HotakeInitScreQuestionsReplyRecordInfoMapper;
+import com.vetti.hotake.mapper.HotakeInitialScreeningQuestionsInfoMapper;
 import com.vetti.hotake.mapper.HotakeRolesApplyInfoMapper;
 import com.vetti.hotake.mapper.HotakeRolesInfoMapper;
 import com.vetti.hotake.service.IHotakeRolesApplyInfoService;
@@ -53,6 +53,12 @@ public class HotakeRolesApplyInfoServiceImpl extends BaseServiceImpl implements
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private HotakeInitScreQuestionsReplyRecordInfoMapper initScreQuestionsReplyRecordInfoMapper;
+
+    @Autowired
+    private HotakeInitialScreeningQuestionsInfoMapper initialScreeningQuestionsInfoMapper;
+
     /**
      * 查询候选人岗位申请信息
      * 
@@ -98,6 +104,11 @@ public class HotakeRolesApplyInfoServiceImpl extends BaseServiceImpl implements
     {
         List<HotakeRolesApplyInfo> applyInfoList = hotakeRolesApplyInfoMapper.selectHotakeRolesApplyInfoList(hotakeRolesApplyInfo);
         if(CollectionUtil.isNotEmpty(applyInfoList)) {
+
+
+            List<HotakeInitScreQuestionsReplyRecordInfo> screQuestionsReplyRecordInfoList = initScreQuestionsReplyRecordInfoMapper.selectHotakeInitScreQuestionsReplyRecordInfoList(new HotakeInitScreQuestionsReplyRecordInfo());
+
+            List<HotakeInitialScreeningQuestionsInfo> screeningQuestionsInfoList = initialScreeningQuestionsInfoMapper.selectHotakeInitialScreeningQuestionsInfoList(new HotakeInitialScreeningQuestionsInfo());
             //查询岗位数据集合
             HotakeRolesInfo query = new HotakeRolesInfo();
 //            query.setRecruiterId(SecurityUtils.getUserId());
@@ -118,11 +129,26 @@ public class HotakeRolesApplyInfoServiceImpl extends BaseServiceImpl implements
                     applyInfo.setCvInfoDto(cvInfoDto);
                 }
                 if(CollectionUtil.isNotEmpty(applyOperRecords)) {
-                    List<HotakeRolesApplyOperRecord> operRecordList = applyOperRecords.stream().filter(e->e.getRoleApplyId().longValue() == applyInfo.getId().longValue()).toList();
+                    List<HotakeRolesApplyOperRecord> operRecordList = applyOperRecords.stream().filter(e->e.getRoleApplyId()!= null &&
+                            e.getRoleApplyId().longValue() == applyInfo.getId().longValue()).toList();
                     if(CollectionUtil.isNotEmpty(operRecordList)) {
                         applyInfo.setApplyOperRecords(operRecordList);
                     }
                 }
+                if(CollectionUtil.isNotEmpty(screQuestionsReplyRecordInfoList)) {
+                    List<HotakeInitScreQuestionsReplyRecordInfo> screQuestionsReplyRecordInfos = screQuestionsReplyRecordInfoList.stream().
+                            filter(e->e.getRoleApplyId() != null && e.getRoleApplyId().longValue() == applyInfo.getId().longValue()).toList();
+                    if(CollectionUtil.isNotEmpty(screQuestionsReplyRecordInfos)) {
+                        for(HotakeInitScreQuestionsReplyRecordInfo recordInfo : screQuestionsReplyRecordInfos){
+                            List<HotakeInitialScreeningQuestionsInfo> screeningQuestionsInfos = screeningQuestionsInfoList.stream().
+                                    filter(e->e.getId().longValue() == recordInfo.getQuestionId().longValue()).toList();
+                            if(CollectionUtil.isNotEmpty(screeningQuestionsInfos)) {
+                                recordInfo.setQuestionText(screeningQuestionsInfos.get(0).getQuestionTitle());
+                            }
+                        }
+                    }
+                    applyInfo.setScreQuestionsReplyRecordInfoList(screQuestionsReplyRecordInfos);
+                }
             }
         }
         return applyInfoList;

vetti-hotakes/src/main/resources/mapper/hotake/HotakeInitScreQuestionsReplyRecordInfoMapper.xml

@@ -104,9 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchInsertHotakeInitScreQuestionsReplyRecordInfo">
-        insert into hotake_init_scre_questions_reply_record_info( id, role_id, candidate_id, question_id, answer_connect, del_flag, create_by, create_time, update_by, update_time, remark) values
+        insert into hotake_init_scre_questions_reply_record_info( id, role_id,role_apply_id, candidate_id, question_id, answer_connect, del_flag, create_by, create_time, update_by, update_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.roleId}, #{item.candidateId}, #{item.questionId}, #{item.answerConnect}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{item.id}, #{item.roleId},#{item.roleApplyId}, #{item.candidateId}, #{item.questionId}, #{item.answerConnect}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>