bug修复

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -138,8 +138,8 @@ public class DatadetailController {
         List<WorkflowExtra> completeCountList = new ArrayList<>();
         for (HistoricProcessInstance historicProcessInstance : finished) {
             workflowExtras.stream()
-                    .filter(e -> e.getProcessId().equals(historicProcessInstance.getId()))
-                    .max(Comparator.comparing(WorkflowExtra::getEndTime))
+                    .filter(e -> e.getProcessId().equals(historicProcessInstance.getId()) && e.getEndTime() != null)
+                    .max(Comparator.comparing(WorkflowExtra::getStartTime))
                     .ifPresent(e -> {
                         completeCountList.add(e);
                     });

src/main/java/com/xjrsoft/module/student/dto/BaseNewStudentPageDto.java

@@ -67,11 +67,14 @@ public class BaseNewStudentPageDto extends PageInput {
     private Long classId;
 
     @ApiModelProperty("就读方式")
-    private Long stduyStatus;
+    private String stduyStatus;
 
     @ApiModelProperty("学期id")
     private Long baseSemesterId;
 
     @ApiModelProperty("是否已报到（1:是 0:否）")
     private Integer isReport;
+
+    @ApiModelProperty("学生来源")
+    private String source;
 }

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -136,9 +136,12 @@
         <if test="dto.isReport != null">
             AND (select count(*) from student_report_record where user_id = t1.id and base_semester_id = #{dto.baseSemesterId} and delete_mark = 0) = #{dto.isReport}
         </if>
-        <if test="dto.stduyStatus != null">
+        <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
             AND t10.stduy_status = #{dto.stduyStatus}
         </if>
+        <if test="dto.source != null and dto.source != ''">
+            AND t1.source = #{dto.source}
+        </if>
         <if test="dto.enrollmentPlanId != null">
             AND t1.enrollment_plan_id = #{dto.enrollmentPlanId}
         </if>