1、优化学生逻辑

2、优化简历投递逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppStudentController.java

@@ -1,14 +1,19 @@
 package com.citu.module.menduner.system.controller.app.jobhunt.person;
 
+import cn.hutool.core.collection.CollUtil;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.common.util.LoginUserContext;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.person.student.evaluate.StudentPracticeEvaluateSaveReqVO;
 import com.citu.module.menduner.system.controller.base.person.student.record.StudentPracticeRecordDetailRespVO;
 import com.citu.module.menduner.system.controller.base.person.student.record.StudentPracticeRecordPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.student.report.StudentPracticeReportRespVO;
 import com.citu.module.menduner.system.controller.base.person.student.report.StudentPracticeReportSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.person.student.StudentPracticeEvaluateService;
 import com.citu.module.menduner.system.service.person.student.StudentPracticeRecordService;
 import com.citu.module.menduner.system.service.person.student.StudentPracticeReportService;
@@ -20,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.List;
 import java.util.Map;
 
@@ -40,13 +44,15 @@ public class AppStudentController {
     private StudentPracticeEvaluateService evaluateService;
     @Resource
     private StudentPracticeReportService reportService;
+    @Resource
+    private EnterpriseService enterpriseService;
 
     @PreAuthenticated
     @GetMapping("/page")
     @Operation(summary = "获得学生实习记录分页")
     public CommonResult<PageResult<StudentPracticeRecordDetailRespVO>> page
             (StudentPracticeRecordPageReqVO reqVO) {
-        return success(studentPracticeRecordService.page(LoginUserContext.getUserId(),reqVO));
+        return success(studentPracticeRecordService.page(LoginUserContext.getUserId(), reqVO));
     }
 
     @PreAuthenticated
@@ -69,7 +75,7 @@ public class AppStudentController {
     @GetMapping("/get/report/list")
     @Operation(summary = "获取学生实习报告列表")
     public CommonResult<Map<String, List<StudentPracticeReportRespVO>>> getReportList
-            (@RequestParam("enterpriseId") Long enterpriseId) {
+            (@RequestParam(value = "enterpriseId", required = false) Long enterpriseId) {
         return success(reportService.getReportList(enterpriseId));
     }
 
@@ -80,4 +86,18 @@ public class AppStudentController {
         reportService.save(reqVO);
         return success(true);
     }
+
+
+    @PreAuthenticated
+    @GetMapping("/record-enterprise/list")
+    @Operation(summary = "获取学生实习的企业列表")
+    public CommonResult<List<EnterpriseBaseSimpleRespVO>> getRecordEnterpriseId() {
+        List<Long> enterpriseIds = studentPracticeRecordService.getRecordEnterpriseId();
+        if (CollUtil.isNotEmpty(enterpriseIds)) {
+            List<EnterpriseDO> enterpriseList = enterpriseService.getByIdList(enterpriseIds);
+            return success(BeanUtils.toBean(enterpriseList, EnterpriseBaseSimpleRespVO.class));
+        }
+        return success(null);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/StudentPracticeRecordMapper.java

@@ -46,14 +46,14 @@ public interface StudentPracticeRecordMapper extends BaseMapperX<StudentPractice
     /**
      * 招聘端-企业分页查询实习的学生信息
      */
-    default PageResult<StudentPracticeRecordDetailRespVO> page(Long userId,StudentPracticeRecordPageReqVO reqVO) {
+    default PageResult<StudentPracticeRecordDetailRespVO> page(Long userId, StudentPracticeRecordPageReqVO reqVO) {
         MPJLambdaWrapperX<StudentPracticeRecordDO> wrapper =
                 new MPJLambdaWrapperX<>();
         wrapper.selectAll(StudentPracticeRecordDO.class);
         wrapper.selectAssociation(PersonInfoDO.class, StudentPracticeRecordDetailRespVO::getPerson);
         wrapper.selectAssociation(StudentDO.class, StudentPracticeRecordDetailRespVO::getStudent);
-        wrapper.selectAssociation(EnterpriseDO.class,StudentPracticeRecordDetailRespVO::getEnterprise);
-        wrapper.selectAssociation(JobAdvertisedDO.class,StudentPracticeRecordDetailRespVO::getJob);
+        wrapper.selectAssociation(EnterpriseDO.class, StudentPracticeRecordDetailRespVO::getEnterprise);
+        wrapper.selectAssociation(JobAdvertisedDO.class, StudentPracticeRecordDetailRespVO::getJob);
         wrapper.innerJoin(PersonInfoDO.class, PersonInfoDO::getId, StudentPracticeRecordDO::getPersonId);
         wrapper.innerJoin(StudentDO.class, StudentDO::getId, StudentPracticeRecordDO::getStudentId);
         wrapper.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, StudentPracticeRecordDO::getEnterpriseId);
@@ -95,4 +95,12 @@ public interface StudentPracticeRecordMapper extends BaseMapperX<StudentPractice
         return selectJoinList(CommonRespVO.class, wrapper);
     }
 
+
+    default List<Long> selectEnterpriseIdListByUserId(Long userId) {
+        MPJLambdaWrapperX<StudentPracticeRecordDO> wrapper = new MPJLambdaWrapperX<>();
+        wrapper.select(StudentPracticeRecordDO::getEnterpriseId);
+        wrapper.eq(StudentPracticeRecordDO::getUserId, userId);
+        return selectJoinList(Long.class, wrapper);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthServiceImpl.java

@@ -183,11 +183,11 @@ public class MdeAuthServiceImpl implements MdeAuthService {
                 // 获取错误次数
                 String num =
                         redisTemplate.opsForValue()
-                                .get(String.format(MDE_AUTH_USER_PWD_LOCK, user.getId()));
+                                .get(String.format(MDE_AUTH_USER_PWD_LOCK,account));
                 Integer numInt = Integer.parseInt(null == num ? "0" : num) + 1;
 
                 redisTemplate.opsForValue()
-                        .set(String.format(MDE_AUTH_USER_PWD_LOCK, user.getId()), String.valueOf(numInt), 8, TimeUnit.HOURS);
+                        .set(String.format(MDE_AUTH_USER_PWD_LOCK, account), String.valueOf(numInt), 8, TimeUnit.HOURS);
                 if (numInt >= 5) {
                     // 8个小时内输错5次 锁定
                     userService.disable(Collections.singletonList(user.getId()));
@@ -205,7 +205,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         }
 
         // 登录成功就清理
-        redisTemplate.delete(String.format(MDE_AUTH_USER_PWD_LOCK, user.getId()));
+        redisTemplate.delete(String.format(MDE_AUTH_USER_PWD_LOCK, account));
         return user;
 
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -184,7 +184,7 @@ public class JobCvRelServiceImpl implements JobCvRelService {
     public Long send(AppHireJobCvRelReqVO reqVO) {
         // 效验职位是否关闭
         JobAdvertisedDO job = jobAdvertisedService.getJobAdvertised(reqVO.getJobId());
-        if (null == reqVO || MendunerStatusEnum.DISABLE.getStatus().equals(job.getStatus())) {
+        if (null == job || MendunerStatusEnum.DISABLE.getStatus().equals(job.getStatus())) {
             throw exception(JOB_CV_REL_JOB_STOP_DELIVERY);
         }
 

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

@@ -55,6 +55,24 @@ public interface StudentPracticeRecordService {
      */
     PageResult<StudentPracticeRecordDO> getStudentPracticeRecordPage(StudentPracticeRecordPageReqVO pageReqVO);
 
+    /**
+     * 上传学生推荐信
+     */
+    void uploadRecommendationLetter(StudentRecommendationLetterReqVO reqVO);
+
+    /**
+     * 评价实习
+     */
+    void saveEvaluate(StudentEvaluateReqVO reqVO);
+
+
+
+    // ========== 招聘端 ==========
+    /**
+     * 获得学生实习的企业id列表
+     * @return 企业id
+     */
+    List<Long> getRecordEnterpriseId();
 
     // ========== 招聘端 ==========
     /**
@@ -70,13 +88,5 @@ public interface StudentPracticeRecordService {
      */
     PageResult<StudentPracticeRecordDetailRespVO> page(Long userId, StudentPracticeRecordPageReqVO reqVO);
 
-    /**
-     * 上传学生推荐信
-     */
-    void uploadRecommendationLetter(StudentRecommendationLetterReqVO reqVO);
 
-    /**
-     * 评价实习
-     */
-    void saveEvaluate(StudentEvaluateReqVO reqVO);
 }

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

@@ -116,4 +116,9 @@ public class StudentPracticeRecordServiceImpl implements StudentPracticeRecordSe
         studentPracticeRecord.setEvaluateUserId(LoginUserContext.getUserId());
         mapper.updateById(studentPracticeRecord);
     }
+
+    @Override
+    public List<Long> getRecordEnterpriseId() {
+        return mapper.selectEnterpriseIdListByUserId(LoginUserContext.getUserId());
+    }
 }

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

@@ -41,7 +41,7 @@ public class StudentPracticeReportServiceImpl implements StudentPracticeReportSe
     public void save(StudentPracticeReportSaveReqVO reqVO) {
         StudentDO student = studentService.getStudentInfo(LoginUserContext.getUserId());
         reqVO.getUrlList().forEach(url -> {
-            if(StringUtils.hasText(url)){
+            if(!StringUtils.hasText(url)){
                 return;
             }
             mapper.insert(StudentPracticeReportDO.builder()

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/user/MdeUserServiceImpl.java

@@ -427,7 +427,7 @@ public class MdeUserServiceImpl implements MdeUserService {
         // 3. 记录操作日志上下文
         LogRecordContext.putVariable("user", user);
         LogRecordContext.putVariable("newPassword", updateObj.getPassword());
-        redisTemplate.delete(String.format(MDE_AUTH_USER_PWD_LOCK, user.getId()));
+        redisTemplate.delete(String.format(MDE_AUTH_USER_PWD_LOCK, user.getPhone()));
     }