|
@@ -9,6 +9,7 @@ import java.net.URL;
|
|
|
import java.net.URLConnection;
|
|
|
import java.util.*;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -43,7 +44,9 @@ import com.fs.qw.service.IQwCompanyService;
|
|
|
import com.fs.qw.service.impl.AsyncUploadQwCourseImageService;
|
|
|
import com.fs.qwApi.Result.QwUploadResult;
|
|
|
import com.fs.qwApi.service.QwApiService;
|
|
|
+import com.fs.system.mapper.SysDictDataMapper;
|
|
|
import com.fs.system.service.ISysConfigService;
|
|
|
+import com.fs.system.vo.DictVO;
|
|
|
import com.fs.voice.utils.StringUtil;
|
|
|
import com.google.zxing.BarcodeFormat;
|
|
|
import com.google.zxing.EncodeHintType;
|
|
@@ -83,6 +86,8 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
|
|
|
@Autowired
|
|
|
private FsCourseWatchLogMapper fsCourseWatchLogMapper;
|
|
|
@Autowired
|
|
|
+ private SysDictDataMapper sysDictDataMapper;
|
|
|
+ @Autowired
|
|
|
private FsUserCourseCommentMapper fsUserCourseCommentMapper;
|
|
|
@Autowired
|
|
|
private FsUserCourseNoteMapper fsUserCourseNoteMapper;
|
|
@@ -279,7 +284,20 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
|
|
|
|
|
|
@Override
|
|
|
public List<FsUserCourseListPVO> selectFsUserCourseListPVO(FsUserCourse param) {
|
|
|
- return fsUserCourseMapper.selectFsUserCourseListPVO(param);
|
|
|
+ List<DictVO> dictVOS = sysDictDataMapper.selectDictDataListByType("sys_course_project");
|
|
|
+ // Create a map for faster lookup (dictValue -> dictVO)
|
|
|
+ Map<String, String> projectMap = dictVOS.stream()
|
|
|
+ .collect(Collectors.toMap(DictVO::getDictValue, DictVO::getDictLabel));
|
|
|
+ List<FsUserCourseListPVO> list = fsUserCourseMapper.selectFsUserCourseListPVO(param);
|
|
|
+ for (FsUserCourseListPVO vo : list) {
|
|
|
+ if (vo.getProject() != null) {
|
|
|
+ String projectName = projectMap.get(vo.getProject().toString());
|
|
|
+ if (projectName != null) {
|
|
|
+ vo.setProjectName(projectName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|