班级合并

src/main/java/com/xjrsoft/module/base/controller/BaseClassMergeController.java

@@ -61,6 +61,7 @@ public class BaseClassMergeController {
                 .select(BaseClassMerge::getId)
                 .select(BaseClassMerge.class,x -> VoToColumnUtil.fieldsToColumns(BaseClassMerge.class).contains(x.getProperty()))
                 .selectAs(BaseClass::getName, BaseClassMergePageVo::getTargetClassName)
+                .selectAs(User::getName, BaseClassMergePageVo::getCreateUserName)
                 .innerJoin(User.class, User::getId, BaseClassMerge::getCreateUserId)
                 .innerJoin(BaseClass.class, BaseClass::getId, BaseClassMerge::getTargetClassId)
                 .like(StrUtil.isNotEmpty(dto.getTargetClassName()), BaseClass::getName, dto.getTargetClassName())

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

@@ -22,6 +22,7 @@ import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.student.entity.StudentChangeRecord;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.student.service.IStudentChangeRecordService;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -157,8 +158,10 @@ public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMerge
                 .selectAs(BaseClass::getName, BaseClassMergeStudentVo::getClassName)
                 .selectAs(User::getName, BaseClassMergeStudentVo::getName)
                 .selectAs(User::getCredentialNumber, BaseClassMergeStudentVo::getCredentialNumber)
-                .select("t3.name", BaseClassMergeStudentVo::getTeacherName)
+                .selectAs(DictionaryDetail::getName, BaseClassMergeStudentVo::getGender)
+                .select("t4.name", BaseClassMergeStudentVo::getTeacherName)
                 .innerJoin(User.class, User::getId, BaseClassMergeStudent::getUserId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, User::getGender)
                 .innerJoin(BaseClass.class, BaseClass::getId, BaseClassMergeStudent::getClassId)
                 .leftJoin(User.class, User::getId, BaseClass::getTeacherId)
                 .eq(BaseClassMergeStudent::getBaseClassMergeId, dto.getBaseClassMergeId())