1、优化学生实习接口

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/student/StudentPracticeRecordServiceImpl.java

@@ -14,6 +14,7 @@ import com.citu.module.menduner.system.dal.dataobject.school.SchoolOrganizationD
 import com.citu.module.menduner.system.dal.mysql.person.StudentPracticeRecordMapper;
 import com.citu.module.menduner.system.enums.person.StudentPracticeStatusEnum;
 import com.citu.module.menduner.system.service.major.MajorService;
+import com.citu.module.menduner.system.service.school.SchoolInfoService;
 import com.citu.module.menduner.system.service.school.SchoolOrganizationService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -41,6 +42,9 @@ public class StudentPracticeRecordServiceImpl implements StudentPracticeRecordSe
     @Resource
     private SchoolOrganizationService schoolOrganizationService;
 
+    @Resource
+    private SchoolInfoService schoolInfoService;
+
     @Resource
     private MajorService majorService;
 
@@ -108,16 +112,15 @@ public class StudentPracticeRecordServiceImpl implements StudentPracticeRecordSe
 
     @Override
     public PageResult<StudentPracticeRecordDetailRespVO> page(Long userId, StudentPracticeRecordPageReqVO reqVO) {
-        PageResult<StudentPracticeRecordDetailRespVO> result =  mapper.page(userId,reqVO);
-        if(null == userId) {
-            result.getList().forEach(resp -> {
-                SchoolOrganizationDO dept = schoolOrganizationService.getSchoolOrganization(resp.getStudent().getSchoolDeptId());
-                resp.getStudent().setSchoolDept(BeanUtils.toBean(dept, SchoolOrganizationRespVO.class));
-                SchoolOrganizationDO schoolClass = schoolOrganizationService.getSchoolOrganization(resp.getStudent().getSchoolClassId());
-                resp.getStudent().setSchoolClass(BeanUtils.toBean(schoolClass, SchoolOrganizationRespVO.class));
-                resp.getStudent().setMajor(BeanUtils.toBean(majorService.getMajor(resp.getStudent().getMajorId()), MajorRespVO.class));
-            });
-        }
+        PageResult<StudentPracticeRecordDetailRespVO> result = mapper.page(userId, reqVO);
+        result.getList().forEach(resp -> {
+            resp.getStudent().setSchoolInfo(schoolInfoService.getBySchoolId(resp.getStudent().getSchoolId()));
+            SchoolOrganizationDO dept = schoolOrganizationService.getSchoolOrganization(resp.getStudent().getSchoolDeptId());
+            resp.getStudent().setSchoolDept(BeanUtils.toBean(dept, SchoolOrganizationRespVO.class));
+            SchoolOrganizationDO schoolClass = schoolOrganizationService.getSchoolOrganization(resp.getStudent().getSchoolClassId());
+            resp.getStudent().setSchoolClass(BeanUtils.toBean(schoolClass, SchoolOrganizationRespVO.class));
+            resp.getStudent().setMajor(BeanUtils.toBean(majorService.getMajor(resp.getStudent().getMajorId()), MajorRespVO.class));
+        });
         return result;
     }
 
@@ -170,11 +173,11 @@ public class StudentPracticeRecordServiceImpl implements StudentPracticeRecordSe
         PageResult<StudentPracticeRecordSchoolRespVO> result = mapper.selectCount(reqVO);
         result.getList().forEach(resp -> {
             resp.setWaitingNum(mapper
-                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(),resp.getId(), StudentPracticeStatusEnum.WAITING.getStatus()));
+                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(), resp.getId(), StudentPracticeStatusEnum.WAITING.getStatus()));
             resp.setInProgressNum(mapper
-                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(),resp.getId(), StudentPracticeStatusEnum.IN_PROGRESS.getStatus()));
+                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(), resp.getId(), StudentPracticeStatusEnum.IN_PROGRESS.getStatus()));
             resp.setEndNum(mapper
-                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(),resp.getId(), StudentPracticeStatusEnum.END.getStatus()));
+                    .getNumByEnterpriseIdAndStatus(resp.getSchoolInfo().getSchoolId(), resp.getId(), StudentPracticeStatusEnum.END.getStatus()));
         });
         return result;
     }