Parcourir la source

学生实习记录

dzx il y a 5 mois
Parent
commit
3891946cc1

+ 1 - 1
src/main/java/com/xjrsoft/module/internship/service/impl/InternshipPlanManageParticipantServiceImpl.java

@@ -160,7 +160,7 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
                         .eq(InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
                         .eq(InternshipPlanManageParticipant::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
-        Map<Long, String> collect = participantList.stream().collect(Collectors.toMap(InternshipPlanManageParticipant::getParticipantUserId, InternshipPlanManageParticipant::getResult));
+        Map<Long, String> collect = participantList.stream().filter(x -> x.getResult() != null).collect(Collectors.toMap(InternshipPlanManageParticipant::getParticipantUserId, InternshipPlanManageParticipant::getResult));
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
         for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
             if(collect.containsKey(vo.getId())){

+ 1 - 0
src/main/resources/sqlScript/20250623sql.sql

@@ -151,6 +151,7 @@ CREATE TABLE `student_internship_alone_apply` (
   `contract_folder_id` BIGINT DEFAULT NULL COMMENT '合同附件(xjr_file)',
   `wages_folder_id` BIGINT DEFAULT NULL COMMENT '工资流水附件(xjr_file)',
   `summarize_folder_id` BIGINT DEFAULT NULL COMMENT '总结材料附件(xjr_file)',
+  `teacher_id` BIGINT DEFAULT NULL COMMENT '班主任id(xjr_user)',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生自主实习申请表';