Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanManageParticipantController.java

@@ -62,6 +62,21 @@ public class InternshipPlanManageParticipantController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/student-page")
+    @ApiOperation(value="实习学生选择列表(分页)")
+    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @XjrLog(value = "实习学生选择列表(分页)")
+    public RT<PageOutput<InternshipPlanManageParticipantPageVo>> studentPage(@Valid InternshipPlanManageParticipantPageDto dto){
+
+        MPJLambdaWrapper<InternshipPlanManageParticipant> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .orderByDesc(InternshipPlanManageParticipant::getId)
+                .select(InternshipPlanManageParticipant.class,x -> VoToColumnUtil.fieldsToColumns(InternshipPlanManageParticipantPageVo.class).contains(x.getProperty()));
+        IPage<InternshipPlanManageParticipant> page = internshipPlanManageParticipantService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(page, InternshipPlanManageParticipantPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习计划参与人表信息")
     @SaCheckPermission("internshipplanmanageparticipant:detail")

src/main/java/com/xjrsoft/module/internship/vo/InternshipPlanManageVo.java

@@ -148,4 +148,7 @@ public class InternshipPlanManageVo {
     @ApiModelProperty("internshipPlanClass子表")
     private List<InternshipPlanClassVo> internshipPlanClassList;
 
+    @ApiModelProperty("合作企业id")
+    private String internshipUnitId;
+
 }