Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 257ab91d49133404a108841e6b399123364c7b06
+  newTag: ad1aea2d111070ad4c27b8df5734a8258837d3ff

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -2,6 +2,7 @@ package com.mmc.csf.release.controller;
 
 import com.mmc.csf.common.util.date.TDateUtil;
 import com.mmc.csf.common.util.math.CodeUtil;
+import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
@@ -85,7 +86,15 @@ public class FlyerTrainingController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
     @PostMapping("/queryCurriculumInfoList")
     public ResultBody queryCurriculumInfoList(@RequestBody CurriculumQo curriculumQo) {
-        return ResultBody.success(flyerTrainingService.queryCurriculumInfoList(curriculumQo));
+        PageResult pageResult = flyerTrainingService.queryCurriculumInfoList(curriculumQo);
+        return ResultBody.success(pageResult);
+    }
+
+    @ApiOperation(value = "根据课程id查询课程名称信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
+    @GetMapping("/selectCurriculuInfoById")
+    public ResultBody  queryCurriculumInfoById(@RequestParam List<Integer> ids) {
+        return flyerTrainingService.queryCurriculumInfoById(ids);
     }
 
     @ApiOperation(value = "feign-V1.0.1课程视频列表", hidden = true)

release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java

@@ -140,4 +140,6 @@ public interface FlyerTrainingDao {
     int selectCountCurriculumOrder(Integer id,Integer userId);
 
     int insertCurriculumOrder(CurriculumOrderDO record);
+
+    CurriculumInfoDO queryCurriculumInfoById(Integer id);
 }

release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java

@@ -163,4 +163,6 @@ public interface FlyerTrainingService {
      * @return {@link ResultBody}
      */
     ResultBody deleteCurriculumOrderInfo(Integer id);
+
+    ResultBody  queryCurriculumInfoById(List<Integer> ids);
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -391,4 +391,17 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody queryCurriculumInfoById(List<Integer> ids) {
+        List<CurriculumInfoDO> curriculumInfoDOArrayList = new ArrayList<>();
+        for (Integer id : ids){
+            CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.queryCurriculumInfoById(id);
+            if (curriculumInfoDO != null){
+                curriculumInfoDOArrayList.add(curriculumInfoDO);
+            }
+        }
+        List<CurriculumInfoVO> list = curriculumInfoDOArrayList.stream().map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList());
+        return ResultBody.success(list);
+    }
+
 }

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -295,4 +295,10 @@
         select count(id) from curriculum_order
         where user_account_id = #{userId} and curriculum_info_id = #{id}
     </select>
+    <select id="queryCurriculumInfoById" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
+        SELECT *
+        from curriculum_info
+        where id = #{id} and is_deleted = 0
+    </select>
+
 </mapper>