|
|
@@ -12,6 +12,7 @@ import com.xjrsoft.common.utils.FormatUtil;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.base.mapper.BaseClassMapper;
|
|
|
+import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
import com.xjrsoft.module.organization.entity.User;
|
|
|
import com.xjrsoft.module.organization.mapper.UserMapper;
|
|
|
import com.xjrsoft.module.room.mapper.RoomBedMapper;
|
|
|
@@ -32,10 +33,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @title: 助学金申请
|
|
|
@@ -112,7 +110,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
|
|
|
public Boolean updateInfo(UpdateBaseStudentInfoDto dto) {
|
|
|
for (Long id : dto.getUserIds()) {
|
|
|
BaseStudentSchoolRoll schoolRoll = this.getOne(new QueryWrapper<BaseStudentSchoolRoll>().lambda().eq(BaseStudentSchoolRoll::getUserId, id));
|
|
|
- if (dto.getStduyStatus() !=null && !dto.getStduyStatus().equals(schoolRoll.getStduyStatus())) {
|
|
|
+ if (dto.getStduyStatus() != null && !dto.getStduyStatus().equals(schoolRoll.getStduyStatus())) {
|
|
|
recordService.insertData(
|
|
|
StudyStatusEnum.fromCode(schoolRoll.getStduyStatus()),
|
|
|
schoolRoll.getStduyStatus(),
|
|
|
@@ -124,7 +122,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
|
|
|
2
|
|
|
);
|
|
|
}
|
|
|
- if (dto.getRollModality() !=null && !dto.getRollModality().equals(schoolRoll.getLearnStatus())) {
|
|
|
+ if (dto.getRollModality() != null && !dto.getRollModality().equals(schoolRoll.getLearnStatus())) {
|
|
|
recordService.insertData(
|
|
|
RollModalityEnum.fromCode(schoolRoll.getLearnStatus()),
|
|
|
schoolRoll.getLearnStatus(),
|
|
|
@@ -136,7 +134,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
|
|
|
2
|
|
|
);
|
|
|
}
|
|
|
- if (dto.getArchivesStatus() !=null && schoolRoll.getArchivesStatus() != null && !schoolRoll.getArchivesStatus().equals(dto.getArchivesStatus())) {
|
|
|
+ if (dto.getArchivesStatus() != null && schoolRoll.getArchivesStatus() != null && !schoolRoll.getArchivesStatus().equals(dto.getArchivesStatus())) {
|
|
|
recordService.insertData(
|
|
|
ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
|
|
|
schoolRoll.getArchivesStatus(),
|
|
|
@@ -148,13 +146,19 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
|
|
|
2
|
|
|
);
|
|
|
}
|
|
|
- if((dto.getArchivesStatus() != null && !ArchivesStatusEnum.FB2901.getCode().equals(dto.getArchivesStatus())
|
|
|
- || (dto.getStduyStatus() != null && !StudyStatusEnum.InResidence.getCode().equals(dto.getStduyStatus())))){
|
|
|
+ if ((dto.getArchivesStatus() != null && !ArchivesStatusEnum.FB2901.getCode().equals(dto.getArchivesStatus())
|
|
|
+ || (dto.getStduyStatus() != null && !StudyStatusEnum.InResidence.getCode().equals(dto.getStduyStatus())))) {
|
|
|
roomBedMapper.clearBedInfoByStudentUserId(id, StpUtil.getLoginIdAsLong());
|
|
|
}
|
|
|
|
|
|
baseStudentSchoolRollMapper.updateInfoByUserId(dto, id);
|
|
|
}
|
|
|
+
|
|
|
+ // 修改学生状态为退学和毕业的时候,删除海康信息 2025-12-15
|
|
|
+ if (ArchivesStatusEnum.FB2904.getCode().equals(dto.getArchivesStatus()) || ArchivesStatusEnum.FB2907.getCode().equals(dto.getArchivesStatus())) {
|
|
|
+ DataUtil dataUtil = new DataUtil();
|
|
|
+ dataUtil.deletePerson(dto.getUserIds());
|
|
|
+ }
|
|
|
return true;
|
|
|
}
|
|
|
|