优化
This commit is contained in:
@ -587,6 +587,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
|
|||||||
//1级
|
//1级
|
||||||
for (BookSubject subject : subjectList) {
|
for (BookSubject subject : subjectList) {
|
||||||
if (subject.getCode().length() == 4) {
|
if (subject.getCode().length() == 4) {
|
||||||
|
subject.setIdPath("/"+subject.getId());
|
||||||
subject.setDisplayName(subject.getName());
|
subject.setDisplayName(subject.getName());
|
||||||
subject.setPinyinDisplayCode(subject.getPinyinCode());
|
subject.setPinyinDisplayCode(subject.getPinyinCode());
|
||||||
}
|
}
|
||||||
@ -598,6 +599,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
|
|||||||
BookSubject parentSubject = subjectMap.get(parentCode);
|
BookSubject parentSubject = subjectMap.get(parentCode);
|
||||||
if (parentSubject != null) {
|
if (parentSubject != null) {
|
||||||
subject.setParentId(parentSubject.getId());
|
subject.setParentId(parentSubject.getId());
|
||||||
|
subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
|
||||||
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
||||||
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
||||||
} else {
|
} else {
|
||||||
@ -613,6 +615,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
|
|||||||
BookSubject parentSubject = subjectMap.get(parentCode);
|
BookSubject parentSubject = subjectMap.get(parentCode);
|
||||||
if (parentSubject != null) {
|
if (parentSubject != null) {
|
||||||
subject.setParentId(parentSubject.getId());
|
subject.setParentId(parentSubject.getId());
|
||||||
|
subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
|
||||||
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
||||||
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
||||||
} else {
|
} else {
|
||||||
@ -628,6 +631,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
|
|||||||
BookSubject parentSubject = subjectMap.get(parentCode);
|
BookSubject parentSubject = subjectMap.get(parentCode);
|
||||||
if (parentSubject != null) {
|
if (parentSubject != null) {
|
||||||
subject.setParentId(parentSubject.getId());
|
subject.setParentId(parentSubject.getId());
|
||||||
|
subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
|
||||||
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
|
||||||
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -41,6 +41,7 @@
|
|||||||
AND jest.book_id = #{Dto.bookId}
|
AND jest.book_id = #{Dto.bookId}
|
||||||
WHERE jest.employee_id IS NULL
|
WHERE jest.employee_id IS NULL
|
||||||
AND je.deleted = 'n'
|
AND je.deleted = 'n'
|
||||||
|
AND je.employee_status = 'RESIDENT'
|
||||||
AND je.book_id = #{Dto.bookId}
|
AND je.book_id = #{Dto.bookId}
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user