修改班级学生统计

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassMergeServiceImpl.java

@@ -93,11 +93,13 @@ public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMerge
                             .select(StudentChangeClass::getStudentUserId)
                             .innerJoin(WorkflowFormRelation.class, WorkflowFormRelation::getFormKeyValue, StudentChangeClass::getId)
                             .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_ACTIVE)
+                            .eq(StudentChangeClass::getAfterClassId,baseClassMerge.getTargetClassId())
             );
 
             String sql = "SELECT DISTINCT student_user_id FROM temporary_change_class t1" +
                     " INNER JOIN xjr_workflow_form_relation t2 ON t1.id = CAST(t2.form_key_value AS SIGNED)" +
-                    " WHERE t1.delete_mark = 0 AND t2.current_state = 'ACTIVE'";
+                    " WHERE t1.delete_mark = 0 AND t2.current_state = 'ACTIVE'" +
+                    " AND t1.after_class_id = " + baseClassMerge.getTargetClassId();
             List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
 
             int classCount = actualStudentCount + count + list.size();