Parcourir la source

分班bug修复

dzx il y a 8 mois
Parent
commit
7500e30d40

+ 1 - 1
src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -771,7 +771,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
                         .eq(StudentReportPlan::getEnabledMark, EnabledMark.ENABLED.getCode())
                         .eq(StudentReportPlan::getSemesterId, semester.getId())
                         .eq(StudentReportPlan::getCategory, 2)
-                        .eq(StudentReportPlan::getBandingTaskId, dto.getBandingTaskId())
+                        .eq(StudentReportPlan::getBandingTaskId, dto.getId())
         );
         if(plan == null){
             plan = new StudentReportPlan() {{

+ 3 - 0
src/main/java/com/xjrsoft/module/banding/vo/BandingTaskClassStudentListVo.java

@@ -56,4 +56,7 @@ public class BandingTaskClassStudentListVo {
     @ApiModelProperty("分数")
     private BigDecimal score;
 
+    @ApiModelProperty("分班备注")
+    private String remarks;
+
 }

+ 1 - 1
src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -75,7 +75,7 @@
     </select>
 
     <select id="getClassStudent" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto" resultType="com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo">
-        SELECT t1.id,t1.credential_number,t1.name,t4.name AS gender_cn,t1.graduate_school,t1.graduate_class,
+        SELECT t1.id,t1.credential_number,t1.name,t4.name AS gender_cn,t1.graduate_school,t1.graduate_class,t1.remarks,
         t5.name AS first_ambition, t6.name AS second_ambition,t7.name AS stduy_status_cn,t1.height,t1.weight,t1.score,t3.name AS class_name,
         t8.name AS teacher_name FROM base_new_student t1
         LEFT JOIN banding_task_class_student t2 ON t1.id = t2.new_student_id AND t2.delete_mark = 0